Changeset 69cb623 for protocols/nogaim.c

Timestamp:

2006-10-15T09:41:12Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2529faf

Parents:

695e392 (diff), e97827b (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:

Merging with storage-xml. It seems to be working pretty well, so maybe
this way more people will test it. :-)

File:

• protocols/nogaim.c (modified) (40 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 );
 }
@@ -220 +207 @@
         va_end( params );
 
-        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getbool( &gc->irc->set, "strip_html" ) ) )
                 strip_html( text );
         
         /* 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;
@@ -297 +284 @@
         b_event_remove( gc->keepalive );
         gc->flags |= OPT_LOGGING_OUT;
+        
         gc->keepalive = 0;
-        gc->prpl->close( gc );
+        gc->acc->prpl->close( gc );
         b_event_remove( gc->inpa );
         
@@ -323 +311 @@
                 /* Uhm... This is very sick. */
         }
-        else if( !gc->wants_to_die && set_getint( irc, "auto_reconnect" ) )
-        {
-                int delay = set_getint( irc, "auto_reconnect_delay" );
+        else if( !gc->wants_to_die && set_getbool( &irc->set, "auto_reconnect" ) &&
+                 set_getbool( &a->set, "auto_reconnect" ) )
+        {
+                int delay = set_getint( &irc->set, "auto_reconnect_delay" );
                 
                 serv_got_crap( gc, "Reconnecting in %d seconds..", delay );
@@ -364 +353 @@
         irc_t *irc = gc->irc;
         
-        if( set_getint( irc, "debug" ) && 0 ) /* This message is too useless */
+        if( set_getbool( &irc->set, "debug" ) && 0 ) /* This message is too useless */
                 serv_got_crap( gc, "Receiving user add from handle: %s", handle );
         
         if( user_findhandle( gc, handle ) )
         {
-                if( set_getint( irc, "debug" ) )
+                if( set_getbool( &irc->set, "debug" ) )
                         serv_got_crap( gc, "User already exists, ignoring add request: %s", handle );
                 
@@ -378 +367 @@
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( gc->irc, handle, gc->prpl, realname ) );
+        strcpy( nick, nick_get( gc->acc, handle, realname ) );
         
         u = user_add( gc->irc, nick );
@@ -390 +379 @@
                 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 );
@@ -409 +398 @@
         else
         {
-                u->host = g_strdup( gc->user->prpl->name );
+                u->host = g_strdup( gc->acc->prpl->name );
                 u->user = g_strdup( handle );
         }
@@ -457 +446 @@
                 u->realname = g_strdup( realname );
                 
-                if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( gc->irc, "display_namechanges" ) )
+                if( ( gc->flags & OPT_LOGGED_IN ) && set_getbool( &gc->irc->set, "display_namechanges" ) )
                         serv_got_crap( gc, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
@@ -479 +468 @@
 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 );
         
@@ -513 +502 @@
         if( !u )
         {
-                if( g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "add" ) == 0 )
+                if( g_strcasecmp( set_getstr( &gc->irc->set, "handle_unknown" ), "add" ) == 0 )
                 {
                         add_buddy( gc, NULL, handle, NULL );
@@ -520 +509 @@
                 else
                 {
-                        if( set_getint( gc->irc, "debug" ) || g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "ignore" ) != 0 )
+                        if( set_getbool( &gc->irc->set, "debug" ) || g_strcasecmp( set_getstr( &gc->irc->set, "handle_unknown" ), "ignore" ) != 0 )
                         {
                                 serv_got_crap( gc, "serv_got_update() for handle %s:", handle );
@@ -558 +547 @@
         }
         
-        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 )
@@ -571 +560 @@
                         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
@@ -579 +568 @@
         
         /* LISPy... */
-        if( ( set_getint( gc->irc, "away_devoice" ) ) &&                /* Don't do a thing when user doesn't want it */
+        if( ( set_getbool( &gc->irc->set, "away_devoice" ) ) &&         /* Don't do a thing when user doesn't want it */
             ( u->online ) &&                                            /* Don't touch offline people */
             ( ( ( u->online != oo ) && !u->away ) ||                    /* Voice joining people */
@@ -598 +587 @@
         if( !u )
         {
-                char *h = set_getstr( irc, "handle_unknown" );
+                char *h = set_getstr( &irc->set, "handle_unknown" );
                 
                 if( g_strcasecmp( h, "ignore" ) == 0 )
                 {
-                        if( set_getint( irc, "debug" ) )
+                        if( set_getbool( &irc->set, "debug" ) )
                                 serv_got_crap( gc, "Ignoring message from unknown handle %s", handle );
                         
@@ -609 +598 @@
                 else if( g_strncasecmp( h, "add", 3 ) == 0 )
                 {
-                        int private = set_getint( irc, "private" );
+                        int private = set_getbool( &irc->set, "private" );
                         
                         if( h[3] )
@@ -630 +619 @@
         }
         
-        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getbool( &gc->irc->set, "strip_html" ) ) )
                 strip_html( msg );
 
@@ -671 +660 @@
         user_t *u;
         
-        if( !set_getint( gc->irc, "typing_notice" ) )
+        if( !set_getbool( &gc->irc->set, "typing_notice" ) )
                 return;
         
@@ -693 +682 @@
         GList *ir;
         
-        if( set_getint( gc->irc, "debug" ) )
+        if( set_getbool( &gc->irc->set, "debug" ) )
                 serv_got_crap( gc, "You were removed from conversation %d", (int) id );
         
@@ -732 +721 @@
         
         /* 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;
         
@@ -738 +727 @@
         for( c = gc->conversations; c && c->id != id; c = c->next );
         
-        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getbool( &gc->irc->set, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -772 +761 @@
         g_free( s );
         
-        if( set_getint( gc->irc, "debug" ) )
+        if( set_getbool( &gc->irc->set, "debug" ) )
                 serv_got_crap( gc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
         
@@ -786 +775 @@
         int me = 0;
         
-        if( set_getint( b->gc->irc, "debug" ) )
+        if( set_getbool( &b->gc->irc->set, "debug" ) )
                 serv_got_crap( b->gc, "User %s added to conversation %d", handle, b->id );
         
         /* It might be yourself! */
-        if( b->gc->prpl->cmp_buddynames( handle, b->gc->user->username ) == 0 )
+        if( b->gc->acc->prpl->handle_cmp( handle, b->gc->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );
@@ -820 +809 @@
         int me = 0;
         
-        if( set_getint( b->gc->irc, "debug" ) )
+        if( set_getbool( &b->gc->irc->set, "debug" ) )
                 serv_got_crap( b->gc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );
         
         /* 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 );
@@ -882 +871 @@
 }
 
-char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value )
-{
+char *set_eval_away_devoice( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
         int st;
         
@@ -897 +887 @@
         /* Horror.... */
         
-        if( st != set_getint( irc, "away_devoice" ) )
+        if( st != set_getbool( &irc->set, "away_devoice" ) )
         {
                 char list[80] = "";
@@ -937 +927 @@
         }
         
-        return( set_eval_bool( irc, set, value ) );
+        return( set_eval_bool( set, value ) );
 }
 
@@ -957 +947 @@
         }
         
-        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 );
         
@@ -974 +964 @@
         }
         
-        st = gc->prpl->chat_send( gc, id, msg );
+        st = gc->acc->prpl->chat_send( gc, id, msg );
         g_free( buf );
         
@@ -988 +978 @@
         
         if( !away ) away = "";
-        ms = m = gc->prpl->away_states( gc );
+        ms = m = gc->acc->prpl->away_states( gc );
         
         while( m )
@@ -1009 +999 @@
         if( m )
         {
-                gc->prpl->set_away( gc, m->data, *away ? away : NULL );
+                gc->acc->prpl->set_away( gc, m->data, *away ? away : NULL );
         }
         else
@@ -1016 +1006 @@
                 if( s )
                 {
-                        gc->prpl->set_away( gc, s, away );
-                        if( set_getint( gc->irc, "debug" ) )
+                        gc->acc->prpl->set_away( gc, s, away );
+                        if( set_getbool( &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 );
         }
         
@@ -1073 +1063 @@
 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->handle_cmp ) == NULL )
         {
                 gc->permit = g_slist_prepend( gc->permit, g_strdup( handle ) );
         }
         
-        gc->prpl->add_permit( gc, handle );
+        gc->acc->prpl->add_permit( gc, handle );
 }
 
@@ -1085 +1075 @@
         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->handle_cmp ) ) )
         {
                 g_free( l->data );
@@ -1091 +1081 @@
         }
         
-        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->handle_cmp ) == NULL )
         {
                 gc->deny = g_slist_prepend( gc->deny, g_strdup( handle ) );
         }
         
-        gc->prpl->add_deny( gc, handle );
+        gc->acc->prpl->add_deny( gc, handle );
 }
 
@@ -1108 +1098 @@
         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->handle_cmp ) ) )
         {
                 g_free( l->data );
@@ -1114 +1104 @@
         }
         
-        gc->prpl->rem_deny( gc, handle );
-}
+        gc->acc->prpl->rem_deny( gc, handle );
+}