Changeset 5b52a48 for root_commands.c

Timestamp:

2006-07-03T21:22:45Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7e3592e

Parents:

911f2eb

Message:

Implemented per-account nick lists instead of per-protocol nick lists.
nick_t is dead, instead nicks are just saves in a per-account_t GLib
hash table. While doing this, the import_buddies command finally died
and text_save() disappeared, because the old file format can't handle
most of the new features in this branch anyway.

Still have to implement support for the new nick lists in text_load()!

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -466 +466 @@
                 else
                 {
-                        nick_set( irc, cmd[2], a->gc->acc->prpl, cmd[3] );
+                        nick_set( a, cmd[2], cmd[3] );
                 }
         }
@@ -548 +548 @@
                 else if( u->send_handler == buddy_send_handler )
                 {
-                        nick_set( irc, u->handle, u->gc->acc->prpl, cmd[2] );
+                        nick_set( u->gc->acc, u->handle, cmd[2] );
                 }
                 
@@ -569 +569 @@
         u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
         user_del( irc, cmd[1] );
-        nick_del( irc, cmd[1] );
+        nick_del( u->gc->acc, u->handle );
         
         irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
@@ -879 +879 @@
                 else
                         irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
-}
-
-static void cmd_import_buddies( irc_t *irc, char **cmd )
-{
-        struct gaim_connection *gc;
-        account_t *a;
-        nick_t *n;
-        
-        if( !( a = account_get( irc, cmd[1] ) ) )
-        {
-                irc_usermsg( irc, "Invalid account" );
-                return;
-        }
-        else if( !( ( gc = a->gc ) && ( a->gc->flags & OPT_LOGGED_IN ) ) )
-        {
-                irc_usermsg( irc, "That account is not on-line" );
-                return;
-        }
-        
-        if( cmd[2] )
-        {
-                if( g_strcasecmp( cmd[2], "clear" ) == 0 )
-                {
-                        user_t *u;
-                        
-                        /* FIXME: Hmmm, this is actually pretty dangerous code... REMOVEME? :-) */
-                        for( u = irc->users; u; u = u->next )
-                                if( u->gc == gc )
-                                {
-                                        u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
-                                        user_del( irc, u->nick );
-                                }
-                        
-                        irc_usermsg( irc, "Old buddy list cleared." );
-                }
-                else
-                {
-                        irc_usermsg( irc, "Invalid argument: %s", cmd[2] );
-                        return;
-                }
-        }
-        
-        for( n = gc->irc->nicks; n; n = n->next )
-        {
-                if( n->proto == gc->acc->prpl && !user_findhandle( gc, n->handle ) )
-                {
-                        gc->acc->prpl->add_buddy( gc, n->handle );
-                        add_buddy( gc, NULL, n->handle, NULL );
-                }
-        }
-        
-        irc_usermsg( irc, "Sent all add requests. Please wait for a while, the server needs some time to handle all the adds." );
 }
 
@@ -951 +899 @@
         { "blist",          0, cmd_blist,          0 },
         { "nick",           1, cmd_nick,           0 },
-        { "import_buddies", 1, cmd_import_buddies, 0 },
         { "qlist",          0, cmd_qlist,          0 },
         { NULL }