Changeset 0da65d5 for irc.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.c (modified) (14 diffs)

irc.c

@@ -230 +230 @@
         
         for (account = irc->accounts; account; account = account->next) {
-                if (account->gc) {
-                        account->gc->wants_to_die = TRUE;
-                        signoff(account->gc);
+                if (account->ic) {
+                        account->ic->wants_to_die = TRUE;
+                        signoff(account->ic);
                 } else if (account->reconnect) {
                         cancel_auto_reconnect(account);
@@ -256 +256 @@
         
         while (irc->accounts)
-                if (irc->accounts->gc == NULL)
+                if (irc->accounts->ic == NULL)
                         account_del(irc, irc->accounts);
                 else
@@ -633 +633 @@
         user_t *u;
         char namelist[385] = "";
-        struct conversation *c = NULL;
+        struct groupchat *c = NULL;
         char *ops = set_getstr( &irc->set, "ops" );
         
@@ -649 +649 @@
                         }
                         
-                        if( u->gc && !u->away && set_getbool( &irc->set, "away_devoice" ) )
+                        if( u->ic && !u->away && set_getbool( &irc->set, "away_devoice" ) )
                                 strcat( namelist, "+" );
                         else if( ( strcmp( u->nick, irc->mynick ) == 0 && ( strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) == 0 ) ) ||
@@ -668 +668 @@
                                                  strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) ? "@" : "", irc->nick );
                 
-                for( l = c->in_room; l; l = l->next ) if( ( u = user_findhandle( c->gc, l->data ) ) )
+                for( l = c->in_room; l; l = l->next ) if( ( u = user_findhandle( c->ic, l->data ) ) )
                 {
                         if( strlen( namelist ) + strlen( u->nick ) > sizeof( namelist ) - 4 )
@@ -812 +812 @@
         else
         {
-                struct conversation *c = chat_by_channel( channel );
+                struct groupchat *c = chat_by_channel( channel );
                 
                 if( c )
@@ -911 +911 @@
         char reason[128];
         
-        if( u->gc && u->gc->flags & OPT_LOGGING_OUT )
-        {
-                if( u->gc->acc->server )
+        if( u->ic && u->ic->flags & OPT_LOGGING_OUT )
+        {
+                if( u->ic->acc->server )
                         g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
-                                    u->gc->acc->server );
-                else if( ( s = strchr( u->gc->username, '@' ) ) )
+                                    u->ic->acc->server );
+                else if( ( s = strchr( u->ic->username, '@' ) ) )
                         g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
                                     s + 1 );
                 else
                         g_snprintf( reason, sizeof( reason ), "%s %s.%s", irc->myhost,
-                                    u->gc->acc->prpl->name, irc->myhost );
+                                    u->ic->acc->prpl->name, irc->myhost );
                 
                 /* proto_opt might contain garbage after the : */
@@ -945 +945 @@
 int irc_send( irc_t *irc, char *nick, char *s, int flags )
 {
-        struct conversation *c = NULL;
+        struct groupchat *c = NULL;
         user_t *u = NULL;
         
@@ -997 +997 @@
                 else if( g_strncasecmp( s + 1, "TYPING", 6 ) == 0 )
                 {
-                        if( u && u->gc && u->gc->acc->prpl->send_typing && strlen( s ) >= 10 )
+                        if( u && u->ic && u->ic->acc->prpl->send_typing && strlen( s ) >= 10 )
                         {
                                 time_t current_typing_notice = time( NULL );
@@ -1003 +1003 @@
                                 if( current_typing_notice - u->last_typing_notice >= 5 )
                                 {
-                                        u->gc->acc->prpl->send_typing( u->gc, u->handle, s[8] == '1' );
+                                        u->ic->acc->prpl->send_typing( u->ic, u->handle, s[8] == '1' );
                                         u->last_typing_notice = current_typing_notice;
                                 }
@@ -1036 +1036 @@
                 }
         }
-        else if( c && c->gc && c->gc->acc && c->gc->acc->prpl )
-        {
-                return( bim_chat_msg( c, s ) );
+        else if( c && c->ic && c->ic->acc && c->ic->acc->prpl )
+        {
+                return( bim_chat_msg( c, s, 0 ) );
         }
         
@@ -1053 +1053 @@
         
         u->sendbuf[u->sendbuf_len-2] = 0; /* Cut off the last newline */
-        bim_buddy_msg( u->gc, u->handle, u->sendbuf, u->sendbuf_flags );
+        bim_buddy_msg( u->ic, u->handle, u->sendbuf, u->sendbuf_flags );
         
         g_free( u->sendbuf );
@@ -1066 +1066 @@
 void buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags )
 {
-        if( !u || !u->gc ) return;
+        if( !u || !u->ic ) return;
         
         if( set_getbool( &irc->set, "buddy_sendbuffer" ) && set_getint( &irc->set, "buddy_sendbuffer_delay" ) > 0 )
@@ -1105 +1105 @@
         else
         {
-                bim_buddy_msg( u->gc, u->handle, msg, flags );
+                bim_buddy_msg( u->ic, u->handle, msg, flags );
         }
 }