Changeset bf02a67 for commands.c

Timestamp:

2005-12-15T11:55:27Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

15832cc, bd69a21

Parents:

11e090b (diff), 547f937 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged Jelmer's pluginable tree (mainly useful for the Win32 port).

File:

• commands.c (modified) (11 diffs)

commands.c

@@ -166 +166 @@
         if( g_strcasecmp( cmd[1], "add" ) == 0 )
         {
-                int prot;
+                struct prpl *prpl;
                 
                 if( cmd[2] == NULL || cmd[3] == NULL || cmd[4] == NULL )
@@ -174 +174 @@
                 }
                 
-                for( prot = 0; prot < PROTO_MAX; prot ++ )
-                        if( proto_name[prot] && *proto_name[prot] && g_strcasecmp( proto_name[prot], cmd[2] ) == 0 )
-                                break;
-                
-                if( ( prot == PROTO_MAX ) || ( proto_prpl[prot] == NULL ) )
+                prpl = find_protocol(cmd[2]);
+                
+                if( prpl == NULL )
                 {
                         irc_usermsg( irc, "Unknown protocol" );
@@ -184 +182 @@
                 }
 
-                if( prot == PROTO_OSCAR && cmd[5] == NULL )
-                {
-                        irc_usermsg( irc, "Not enough parameters" );
-                        return( 0 );
-                }
-                
-                a = account_add( irc, prot, cmd[3], cmd[4] );
+                a = account_add( irc, prpl, cmd[3], cmd[4] );
                 
                 if( cmd[5] )
@@ -234 +226 @@
                                 con = "";
                         
-                        if( a->protocol == PROTO_OSCAR || a->protocol == PROTO_ICQ || a->protocol == PROTO_TOC )
-                                irc_usermsg( irc, "%2d. OSCAR, %s on %s%s", i, a->user, a->server, con );
-                        else
-                                irc_usermsg( irc, "%2d. %s, %s%s", i, proto_name[a->protocol], a->user, con );
+                        irc_usermsg( irc, "%2d. %s, %s%s", i, a->prpl->name, a->user, con );
                         
                         i ++;
@@ -354 +343 @@
                 else
                 {
-                        nick_set( irc, cmd[2], a->gc->protocol, cmd[3] );
+                        nick_set( irc, cmd[2], a->gc->prpl, cmd[3] );
                 }
         }
@@ -435 +424 @@
         else if( u->send_handler == buddy_send_handler )
         {
-                nick_set( irc, u->handle, u->gc->protocol, cmd[2] );
+                nick_set( irc, u->handle, u->gc->prpl, cmd[2] );
         }
         
@@ -646 +635 @@
         if( online == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && !u->away )
         {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, proto_name[u->gc->user->protocol] );
+                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
                 irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, "Online" );
                 n_online ++;
@@ -653 +642 @@
         if( away == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && u->away )
         {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, proto_name[u->gc->user->protocol] );
+                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
                 irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, u->away );
                 n_away ++;
@@ -660 +649 @@
         if( offline == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && !u->online )
         {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, proto_name[u->gc->user->protocol] );
+                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
                 irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, "Offline" );
                 n_offline ++;
@@ -721 +710 @@
         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, proto_name[q->gc->protocol], q->gc->username, q->question );
+                        irc_usermsg( irc, "%d, %s(%s): %s", num, q->gc->prpl->name, q->gc->username, q->question );
                 else
                         irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
@@ -769 +758 @@
         for( n = gc->irc->nicks; n; n = n->next )
         {
-                if( n->proto == gc->protocol && !user_findhandle( gc, n->handle ) )
+                if( n->proto == gc->prpl && !user_findhandle( gc, n->handle ) )
                 {
                         gc->prpl->add_buddy( gc, n->handle );