Changeset 0a3c243 for root_commands.c

Timestamp:

2006-06-30T23:18:56Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5100caa

Parents:

5c9512f

Message:

Got rid of struct aim_user (now using account_t everywhere). Needs some more
testing though.

File:

• root_commands.c (modified) (16 diffs)

root_commands.c

@@ -400 +400 @@
                 else
                 {
-                        nick_set( irc, cmd[2], a->gc->prpl, cmd[3] );
+                        nick_set( irc, cmd[2], a->gc->acc->prpl, cmd[3] );
                 }
         }
@@ -407 +407 @@
            add them to your *real* (server-side) contact list. */
         if( add_for_real )
-                a->gc->prpl->add_buddy( a->gc, cmd[2] );
+                a->gc->acc->prpl->add_buddy( a->gc, cmd[2] );
                 
         add_buddy( a->gc, NULL, cmd[2], cmd[2] );
@@ -441 +441 @@
         }
         
-        if( !gc->prpl->get_info )
+        if( !gc->acc->prpl->get_info )
         {
                 irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
@@ -447 +447 @@
         else
         {
-                gc->prpl->get_info( gc, cmd[2] );
+                gc->acc->prpl->get_info( gc, cmd[2] );
         }
 }
@@ -482 +482 @@
                 else if( u->send_handler == buddy_send_handler )
                 {
-                        nick_set( irc, u->handle, u->gc->prpl, cmd[2] );
+                        nick_set( irc, u->handle, u->gc->acc->prpl, cmd[2] );
                 }
                 
@@ -501 +501 @@
         s = g_strdup( u->handle );
         
-        u->gc->prpl->remove_buddy( u->gc, u->handle, NULL );
+        u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
         user_del( irc, cmd[1] );
         nick_del( irc, cmd[1] );
@@ -558 +558 @@
         }
         
-        if( !gc->prpl->add_deny || !gc->prpl->rem_permit )
+        if( !gc->acc->prpl->add_deny || !gc->acc->prpl->rem_permit )
         {
                 irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
@@ -617 +617 @@
         }
         
-        if( !gc->prpl->rem_deny || !gc->prpl->add_permit )
+        if( !gc->acc->prpl->rem_deny || !gc->acc->prpl->add_permit )
         {
                 irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
@@ -733 +733 @@
                 if( online == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->acc->prpl->name );
                         irc_usermsg( irc, format, u->nick, s, "Online" );
                 }
@@ -744 +744 @@
                 if( away == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->acc->prpl->name );
                         irc_usermsg( irc, format, u->nick, s, u->away );
                 }
@@ -754 +754 @@
                 if( offline == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->acc->prpl->name );
                         irc_usermsg( irc, format, u->nick, s, "Offline" );
                 }
@@ -779 +779 @@
                 irc_usermsg( irc, "Your name is `%s'" , a->gc->displayname ? a->gc->displayname : "NULL" );
         }
-        else if ( !a->gc->prpl->set_info ) 
+        else if ( !a->prpl->set_info ) 
         {
                 irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
@@ -787 +787 @@
                 irc_usermsg( irc, "Setting your name to `%s'", cmd[2] );
                 
-                a->gc->prpl->set_info( a->gc, cmd[2] );
+                a->prpl->set_info( a->gc, cmd[2] );
         }
 }
@@ -806 +806 @@
         for( num = 0; q; q = q->next, num ++ )
                 if( q->gc ) /* Not necessary yet, but it might come later */
-                        irc_usermsg( irc, "%d, %s(%s): %s", num, q->gc->prpl->name, q->gc->username, q->question );
+                        irc_usermsg( irc, "%d, %s(%s): %s", num, q->gc->acc->prpl->name, q->gc->username, q->question );
                 else
                         irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
@@ -834 +834 @@
                         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->prpl->remove_buddy( u->gc, u->handle, NULL );
+                                        u->gc->acc->prpl->remove_buddy( u->gc, u->handle, NULL );
                                         user_del( irc, u->nick );
                                 }
@@ -852 +853 @@
         for( n = gc->irc->nicks; n; n = n->next )
         {
-                if( n->proto == gc->prpl && !user_findhandle( gc, n->handle ) )
-                {
-                        gc->prpl->add_buddy( gc, n->handle );
+                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 );
                 }