Changeset 0da65d5 for irc_commands.c

Timestamp:

2007-03-31T05:40:45Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

aef4828

Parents:

fa29d093

Message:

s/gaim_connection/im_connection/ and some other minor API changes. The rest
will come tomorrow. It compiles, I'll leave the real testing up to someone
else. ;-)

File:

• irc_commands.c (modified) (8 diffs)

irc_commands.c

@@ -134 +134 @@
 static void irc_cmd_part( irc_t *irc, char **cmd )
 {
-        struct conversation *c;
+        struct groupchat *c;
         
         if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
@@ -150 +150 @@
                 irc_part( irc, u, c->channel );
                 
-                if( c->gc )
+                if( c->ic )
                 {
                         c->joined = 0;
-                        c->gc->acc->prpl->chat_leave( c );
+                        c->ic->acc->prpl->chat_leave( c );
                 }
         }
@@ -173 +173 @@
                         user_t *u = user_find( irc, cmd[1] + 1 );
                         
-                        if( u && u->gc && u->gc->acc->prpl->chat_open )
+                        if( u && u->ic && u->ic->acc->prpl->chat_with )
                         {
                                 irc_reply( irc, 403, "%s :Initializing groupchat in a different channel", cmd[1] );
                                 
-                                if( !u->gc->acc->prpl->chat_open( u->gc, u->handle ) )
+                                if( !u->ic->acc->prpl->chat_with( u->ic, u->handle ) )
                                 {
                                         irc_usermsg( irc, "Could not open a groupchat with %s.", u->nick );
@@ -201 +201 @@
 {
         char *nick = cmd[1], *channel = cmd[2];
-        struct conversation *c = chat_by_channel( channel );
+        struct groupchat *c = chat_by_channel( channel );
         user_t *u = user_find( irc, nick );
         
-        if( u && c && ( u->gc == c->gc ) )
-                if( c->gc && c->gc->acc->prpl->chat_invite )
-                {
-                        c->gc->acc->prpl->chat_invite( c, "", u->handle );
+        if( u && c && ( u->ic == c->ic ) )
+                if( c->ic && c->ic->acc->prpl->chat_invite )
+                {
+                        c->ic->acc->prpl->chat_invite( c, "", u->handle );
                         irc_reply( irc, 341, "%s %s", nick, channel );
                         return;
@@ -271 +271 @@
         char *channel = cmd[1];
         user_t *u = irc->users;
-        struct conversation *c;
+        struct groupchat *c;
         GList *l;
         
@@ -290 +290 @@
                 for( l = c->in_room; l; l = l->next )
                 {
-                        if( ( u = user_findhandle( c->gc, l->data ) ) )
+                        if( ( u = user_findhandle( c->ic, l->data ) ) )
                                 irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname );
                 }
@@ -460 +460 @@
         for( a = irc->accounts; a; a = a->next )
         {
-                struct gaim_connection *gc = a->gc;
-                
-                if( gc && gc->flags & OPT_LOGGED_IN )
-                        bim_set_away( gc, u->away );
+                struct im_connection *ic = a->ic;
+                
+                if( ic && ic->flags & OPT_LOGGED_IN )
+                        bim_set_away( ic, u->away );
         }
 }
@@ -476 +476 @@
                 irc_reply( irc, 311, "%s %s %s * :%s", u->nick, u->user, u->host, u->realname );
                 
-                if( u->gc )
-                        irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->gc->acc->user,
-                                   u->gc->acc->server && *u->gc->acc->server ? u->gc->acc->server : "",
-                                   u->gc->acc->prpl->name );
+                if( u->ic )
+                        irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->ic->acc->user,
+                                   u->ic->acc->server && *u->ic->acc->server ? u->ic->acc->server : "",
+                                   u->ic->acc->prpl->name );
                 else
                         irc_reply( irc, 312, "%s %s :%s", u->nick, irc->myhost, IRCD_INFO );