Changeset 0a3c243 for protocols/nogaim.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:

• protocols/nogaim.c (modified) (24 diffs)

protocols/nogaim.c

@@ -145 +145 @@
 /* multi.c */
 
-struct gaim_connection *new_gaim_conn( struct aim_user *user )
+struct gaim_connection *new_gaim_conn( account_t *acc )
 {
         struct gaim_connection *gc;
-        account_t *a;
         
         gc = g_new0( struct gaim_connection, 1 );
         
-        gc->prpl = user->prpl;
-        g_snprintf( gc->username, sizeof( gc->username ), "%s", user->username );
-        g_snprintf( gc->password, sizeof( gc->password ), "%s", user->password );
-        /* [MD] BUGFIX: don't set gc->irc to the global IRC, but use the one from the struct aim_user.
-         * This fixes daemon mode breakage where IRC doesn't point to the currently active connection.
-         */
-        gc->irc = user->irc;
+        /* Maybe we should get rid of this memory waste later. ;-) */
+        g_snprintf( gc->username, sizeof( gc->username ), "%s", acc->user );
+        g_snprintf( gc->password, sizeof( gc->password ), "%s", acc->pass );
+        
+        gc->irc = acc->irc;
+        gc->acc = acc;
+        acc->gc = gc;
         
         connections = g_slist_append( connections, gc );
-        
-        user->gc = gc;
-        gc->user = user;
-        
-        // Find the account_t so we can set its gc pointer
-        for( a = gc->irc->accounts; a; a = a->next )
-                if( ( struct aim_user * ) a->gc == user )
-                {
-                        a->gc = gc;
-                        break;
-                }
         
         return( gc );
@@ -189 +177 @@
         
         connections = g_slist_remove( connections, gc );
-        g_free( gc->user );
         g_free( gc );
 }
@@ -226 +213 @@
         /* Try to find a different connection on the same protocol. */
         for( a = gc->irc->accounts; a; a = a->next )
-                if( a->prpl == gc->prpl && a->gc != gc )
+                if( a->prpl == gc->acc->prpl && a->gc != gc )
                         break;
         
         /* If we found one, include the screenname in the message. */
         if( a )
-                irc_usermsg( gc->irc, "%s(%s) - %s", gc->prpl->name, gc->username, text );
+                irc_usermsg( gc->irc, "%s(%s) - %s", gc->acc->prpl->name, gc->username, text );
         else
-                irc_usermsg( gc->irc, "%s - %s", gc->prpl->name, text );
+                irc_usermsg( gc->irc, "%s - %s", gc->acc->prpl->name, text );
         
         g_free( text );
@@ -242 +229 @@
         struct gaim_connection *gc = d;
         
-        if( gc->prpl && gc->prpl->keepalive )
-                gc->prpl->keepalive( gc );
+        if( gc->acc->prpl->keepalive )
+                gc->acc->prpl->keepalive( gc );
         
         return TRUE;
@@ -299 +286 @@
         
         gc->keepalive = 0;
-        gc->prpl->close( gc );
+        gc->acc->prpl->close( gc );
         b_event_remove( gc->inpa );
         
@@ -379 +366 @@
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( gc->irc, handle, gc->prpl, realname ) );
+        strcpy( nick, nick_get( gc->irc, handle, gc->acc->prpl, realname ) );
         
         u = user_add( gc->irc, nick );
@@ -391 +378 @@
                 u->user = g_strndup( handle, s - handle );
         }
-        else if( gc->user->proto_opt[0] && *gc->user->proto_opt[0] )
+        else if( *gc->acc->server )
         {
                 char *colon;
                 
-                if( ( colon = strchr( gc->user->proto_opt[0], ':' ) ) )
-                        u->host = g_strndup( gc->user->proto_opt[0],
-                                             colon - gc->user->proto_opt[0] );
+                if( ( colon = strchr( gc->acc->server, ':' ) ) )
+                        u->host = g_strndup( gc->acc->server,
+                                             colon - gc->acc->server );
                 else
-                        u->host = g_strdup( gc->user->proto_opt[0] );
+                        u->host = g_strdup( gc->acc->server );
                 
                 u->user = g_strdup( handle );
@@ -410 +397 @@
         else
         {
-                u->host = g_strdup( gc->user->prpl->name );
+                u->host = g_strdup( gc->acc->prpl->name );
                 u->user = g_strdup( handle );
         }
@@ -480 +467 @@
 void show_got_added_yes( gpointer w, struct show_got_added_data *data )
 {
-        data->gc->prpl->add_buddy( data->gc, data->handle );
+        data->gc->acc->prpl->add_buddy( data->gc, data->handle );
         add_buddy( data->gc, NULL, data->handle, data->handle );
         
@@ -559 +546 @@
         }
         
-        if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "oscar") || !strcmp(gc->prpl->name, "icq")) )
+        if( ( type & UC_UNAVAILABLE ) && ( strcmp( gc->acc->prpl->name, "oscar" ) == 0 || strcmp( gc->acc->prpl->name, "icq" ) == 0 ) )
         {
                 u->away = g_strdup( "Away" );
         }
-        else if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "jabber") ) )
+        else if( ( type & UC_UNAVAILABLE ) && ( strcmp( gc->acc->prpl->name, "jabber" ) == 0 ) )
         {
                 if( type & UC_DND )
@@ -572 +559 @@
                         u->away = g_strdup( "Away" );
         }
-        else if( ( type & UC_UNAVAILABLE ) && gc->prpl->get_status_string )
-        {
-                u->away = g_strdup( gc->prpl->get_status_string( gc, type ) );
+        else if( ( type & UC_UNAVAILABLE ) && gc->acc->prpl->get_status_string )
+        {
+                u->away = g_strdup( gc->acc->prpl->get_status_string( gc, type ) );
         }
         else
@@ -733 +720 @@
         
         /* Gaim sends own messages through this too. IRC doesn't want this, so kill them */
-        if( g_strcasecmp( who, gc->user->username ) == 0 )
+        if( g_strcasecmp( who, gc->username ) == 0 )
                 return;
         
@@ -791 +778 @@
         
         /* It might be yourself! */
-        if( b->gc->prpl->cmp_buddynames( handle, b->gc->user->username ) == 0 )
+        if( b->gc->acc->prpl->cmp_buddynames( handle, b->gc->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );
@@ -825 +812 @@
         
         /* It might be yourself! */
-        if( g_strcasecmp( handle, b->gc->user->username ) == 0 )
+        if( g_strcasecmp( handle, b->gc->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );
@@ -959 +946 @@
         }
         
-        st = gc->prpl->send_im( gc, handle, msg, strlen( msg ), flags );
+        st = gc->acc->prpl->send_im( gc, handle, msg, strlen( msg ), flags );
         g_free( buf );
         
@@ -976 +963 @@
         }
         
-        st = gc->prpl->chat_send( gc, id, msg );
+        st = gc->acc->prpl->chat_send( gc, id, msg );
         g_free( buf );
         
@@ -990 +977 @@
         
         if( !away ) away = "";
-        ms = m = gc->prpl->away_states( gc );
+        ms = m = gc->acc->prpl->away_states( gc );
         
         while( m )
@@ -1011 +998 @@
         if( m )
         {
-                gc->prpl->set_away( gc, m->data, *away ? away : NULL );
+                gc->acc->prpl->set_away( gc, m->data, *away ? away : NULL );
         }
         else
@@ -1018 +1005 @@
                 if( s )
                 {
-                        gc->prpl->set_away( gc, s, away );
+                        gc->acc->prpl->set_away( gc, s, away );
                         if( set_getint( &gc->irc->set, "debug" ) )
                                 serv_got_crap( gc, "Setting away state to %s", s );
                 }
                 else
-                        gc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
+                        gc->acc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
         }
         
@@ -1075 +1062 @@
 void bim_add_allow( struct gaim_connection *gc, char *handle )
 {
-        if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
+        if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) == NULL )
         {
                 gc->permit = g_slist_prepend( gc->permit, g_strdup( handle ) );
         }
         
-        gc->prpl->add_permit( gc, handle );
+        gc->acc->prpl->add_permit( gc, handle );
 }
 
@@ -1087 +1074 @@
         GSList *l;
         
-        if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
+        if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) ) )
         {
                 g_free( l->data );
@@ -1093 +1080 @@
         }
         
-        gc->prpl->rem_permit( gc, handle );
+        gc->acc->prpl->rem_permit( gc, handle );
 }
 
 void bim_add_block( struct gaim_connection *gc, char *handle )
 {
-        if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
+        if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) == NULL )
         {
                 gc->deny = g_slist_prepend( gc->deny, g_strdup( handle ) );
         }
         
-        gc->prpl->add_deny( gc, handle );
+        gc->acc->prpl->add_deny( gc, handle );
 }
 
@@ -1110 +1097 @@
         GSList *l;
         
-        if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
+        if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) ) )
         {
                 g_free( l->data );
@@ -1116 +1103 @@
         }
         
-        gc->prpl->rem_deny( gc, handle );
-}
+        gc->acc->prpl->rem_deny( gc, handle );
+}