Changes in protocols/nogaim.c [5b52a48:fb62f81f]

File:

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

protocols/nogaim.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2006 Wilmer van der Gaast and others                *
+  * Copyright 2002-2004 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -13 +13 @@
  * from scratch for BitlBee and doesn't contain any code from Gaim anymore
  * (except for the function names).
+ *
+ * Copyright 2002-2006 Wilmer van der Gaast <wilmer@gaast.net> and others
  */
 
@@ -145 +147 @@
 /* multi.c */
 
-struct gaim_connection *new_gaim_conn( account_t *acc )
+struct gaim_connection *new_gaim_conn( struct aim_user *user )
 {
         struct gaim_connection *gc;
+        account_t *a;
         
         gc = g_new0( struct gaim_connection, 1 );
         
-        /* 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;
+        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;
         
         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 );
@@ -177 +191 @@
         
         connections = g_slist_remove( connections, gc );
+        g_free( gc->user );
         g_free( gc );
 }
@@ -207 +222 @@
         va_end( params );
 
-        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( &gc->irc->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "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->acc->prpl && a->gc != gc )
+                if( a->prpl == gc->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->acc->prpl->name, gc->username, text );
+                irc_usermsg( gc->irc, "%s(%s) - %s", gc->prpl->name, gc->username, text );
         else
-                irc_usermsg( gc->irc, "%s - %s", gc->acc->prpl->name, text );
+                irc_usermsg( gc->irc, "%s - %s", gc->prpl->name, text );
         
         g_free( text );
 }
 
-static gboolean send_keepalive( gpointer d, gint fd, b_input_condition cond )
+static gboolean send_keepalive( gpointer d )
 {
         struct gaim_connection *gc = d;
         
-        if( gc->acc->prpl->keepalive )
-                gc->acc->prpl->keepalive( gc );
+        if( gc->prpl && gc->prpl->keepalive )
+                gc->prpl->keepalive( gc );
         
         return TRUE;
@@ -249 +264 @@
         serv_got_crap( gc, "Logged in" );
         
-        gc->keepalive = b_timeout_add( 60000, send_keepalive, gc );
+        gc->keepalive = g_timeout_add( 60000, send_keepalive, gc );
         gc->flags |= OPT_LOGGED_IN;
         
@@ -257 +272 @@
 }
 
-gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond )
+gboolean auto_reconnect( gpointer data )
 {
         account_t *a = data;
@@ -269 +284 @@
 void cancel_auto_reconnect( account_t *a )
 {
-        /* while( b_event_remove_by_data( (gpointer) a ) ); */
-        b_event_remove( a->reconnect );
+        while( g_source_remove_by_user_data( (gpointer) a ) );
         a->reconnect = 0;
 }
@@ -281 +295 @@
         
         serv_got_crap( gc, "Signing off.." );
-        
-        b_event_remove( gc->keepalive );
         gc->flags |= OPT_LOGGING_OUT;
         
+        gaim_input_remove( gc->keepalive );
         gc->keepalive = 0;
-        gc->acc->prpl->close( gc );
-        b_event_remove( gc->inpa );
+        gc->prpl->close( gc );
+        gaim_input_remove( gc->inpa );
         
         while( u )
@@ -311 +324 @@
                 /* Uhm... This is very sick. */
         }
-        else if( !gc->wants_to_die && set_getint( &irc->set, "auto_reconnect" ) )
-        {
-                int delay = set_getint( &irc->set, "auto_reconnect_delay" );
-                
+        else if( !gc->wants_to_die && set_getint( irc, "auto_reconnect" ) )
+        {
+                int delay = set_getint( irc, "auto_reconnect_delay" );
                 serv_got_crap( gc, "Reconnecting in %d seconds..", delay );
-                a->reconnect = b_timeout_add( delay * 1000, auto_reconnect, a );
+                
+                a->reconnect = 1;
+                g_timeout_add( delay * 1000, auto_reconnect, a );
         }
         
@@ -352 +366 @@
         irc_t *irc = gc->irc;
         
-        if( set_getint( &irc->set, "debug" ) && 0 ) /* This message is too useless */
+        if( set_getint( irc, "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->set, "debug" ) )
+                if( set_getint( irc, "debug" ) )
                         serv_got_crap( gc, "User already exists, ignoring add request: %s", handle );
                 
@@ -366 +380 @@
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( gc->acc, handle, realname ) );
+        strcpy( nick, nick_get( gc->irc, handle, gc->prpl, realname ) );
         
         u = user_add( gc->irc, nick );
@@ -378 +392 @@
                 u->user = g_strndup( handle, s - handle );
         }
-        else if( gc->acc->server )
+        else if( gc->user->proto_opt[0] && *gc->user->proto_opt[0] )
         {
                 char *colon;
                 
-                if( ( colon = strchr( gc->acc->server, ':' ) ) )
-                        u->host = g_strndup( gc->acc->server,
-                                             colon - gc->acc->server );
+                if( ( colon = strchr( gc->user->proto_opt[0], ':' ) ) )
+                        u->host = g_strndup( gc->user->proto_opt[0],
+                                             colon - gc->user->proto_opt[0] );
                 else
-                        u->host = g_strdup( gc->acc->server );
+                        u->host = g_strdup( gc->user->proto_opt[0] );
                 
                 u->user = g_strdup( handle );
@@ -397 +411 @@
         else
         {
-                u->host = g_strdup( gc->acc->prpl->name );
+                u->host = g_strdup( gc->user->prpl->name );
                 u->user = g_strdup( handle );
         }
@@ -445 +459 @@
                 u->realname = g_strdup( realname );
                 
-                if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( &gc->irc->set, "display_namechanges" ) )
+                if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( gc->irc, "display_namechanges" ) )
                         serv_got_crap( gc, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
@@ -467 +481 @@
 void show_got_added_yes( gpointer w, struct show_got_added_data *data )
 {
-        data->gc->acc->prpl->add_buddy( data->gc, data->handle );
+        data->gc->prpl->add_buddy( data->gc, data->handle );
         add_buddy( data->gc, NULL, data->handle, data->handle );
         
@@ -501 +515 @@
         if( !u )
         {
-                if( g_strcasecmp( set_getstr( &gc->irc->set, "handle_unknown" ), "add" ) == 0 )
+                if( g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "add" ) == 0 )
                 {
                         add_buddy( gc, NULL, handle, NULL );
@@ -508 +522 @@
                 else
                 {
-                        if( set_getint( &gc->irc->set, "debug" ) || g_strcasecmp( set_getstr( &gc->irc->set, "handle_unknown" ), "ignore" ) != 0 )
+                        if( set_getint( gc->irc, "debug" ) || g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "ignore" ) != 0 )
                         {
                                 serv_got_crap( gc, "serv_got_update() for handle %s:", handle );
@@ -546 +560 @@
         }
         
-        if( ( type & UC_UNAVAILABLE ) && ( strcmp( gc->acc->prpl->name, "oscar" ) == 0 || strcmp( gc->acc->prpl->name, "icq" ) == 0 ) )
+        if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "oscar") || !strcmp(gc->prpl->name, "icq")) )
         {
                 u->away = g_strdup( "Away" );
         }
-        else if( ( type & UC_UNAVAILABLE ) && ( strcmp( gc->acc->prpl->name, "jabber" ) == 0 ) )
+        else if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "jabber") ) )
         {
                 if( type & UC_DND )
@@ -559 +573 @@
                         u->away = g_strdup( "Away" );
         }
-        else if( ( type & UC_UNAVAILABLE ) && gc->acc->prpl->get_status_string )
-        {
-                u->away = g_strdup( gc->acc->prpl->get_status_string( gc, type ) );
+        else if( ( type & UC_UNAVAILABLE ) && gc->prpl->get_status_string )
+        {
+                u->away = g_strdup( gc->prpl->get_status_string( gc, type ) );
         }
         else
@@ -567 +581 @@
         
         /* LISPy... */
-        if( ( set_getint( &gc->irc->set, "away_devoice" ) ) &&          /* Don't do a thing when user doesn't want it */
+        if( ( set_getint( gc->irc, "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 */
@@ -586 +600 @@
         if( !u )
         {
-                char *h = set_getstr( &irc->set, "handle_unknown" );
+                char *h = set_getstr( irc, "handle_unknown" );
                 
                 if( g_strcasecmp( h, "ignore" ) == 0 )
                 {
-                        if( set_getint( &irc->set, "debug" ) )
+                        if( set_getint( irc, "debug" ) )
                                 serv_got_crap( gc, "Ignoring message from unknown handle %s", handle );
                         
@@ -597 +611 @@
                 else if( g_strncasecmp( h, "add", 3 ) == 0 )
                 {
-                        int private = set_getint( &irc->set, "private" );
+                        int private = set_getint( irc, "private" );
                         
                         if( h[3] )
@@ -618 +632 @@
         }
         
-        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( &gc->irc->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
                 strip_html( msg );
 
@@ -659 +673 @@
         user_t *u;
         
-        if( !set_getint( &gc->irc->set, "typing_notice" ) )
+        if( !set_getint( gc->irc, "typing_notice" ) )
                 return;
         
@@ -681 +695 @@
         GList *ir;
         
-        if( set_getint( &gc->irc->set, "debug" ) )
+        if( set_getint( gc->irc, "debug" ) )
                 serv_got_crap( gc, "You were removed from conversation %d", (int) id );
         
@@ -720 +734 @@
         
         /* Gaim sends own messages through this too. IRC doesn't want this, so kill them */
-        if( g_strcasecmp( who, gc->username ) == 0 )
+        if( g_strcasecmp( who, gc->user->username ) == 0 )
                 return;
         
@@ -726 +740 @@
         for( c = gc->conversations; c && c->id != id; c = c->next );
         
-        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( &gc->irc->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -760 +774 @@
         g_free( s );
         
-        if( set_getint( &gc->irc->set, "debug" ) )
+        if( set_getint( gc->irc, "debug" ) )
                 serv_got_crap( gc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
         
@@ -774 +788 @@
         int me = 0;
         
-        if( set_getint( &b->gc->irc->set, "debug" ) )
+        if( set_getint( b->gc->irc, "debug" ) )
                 serv_got_crap( b->gc, "User %s added to conversation %d", handle, b->id );
         
         /* It might be yourself! */
-        if( b->gc->acc->prpl->handle_cmp( handle, b->gc->username ) == 0 )
+        if( b->gc->prpl->cmp_buddynames( handle, b->gc->user->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );
@@ -808 +822 @@
         int me = 0;
         
-        if( set_getint( &b->gc->irc->set, "debug" ) )
+        if( set_getint( b->gc->irc, "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->username ) == 0 )
+        if( g_strcasecmp( handle, b->gc->user->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );
@@ -870 +884 @@
 }
 
-char *set_eval_away_devoice( set_t *set, char *value )
-{
-        irc_t *irc = set->data;
+char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value )
+{
         int st;
         
@@ -886 +899 @@
         /* Horror.... */
         
-        if( st != set_getint( &irc->set, "away_devoice" ) )
+        if( st != set_getint( irc, "away_devoice" ) )
         {
                 char list[80] = "";
@@ -926 +939 @@
         }
         
-        return( set_eval_bool( set, value ) );
+        return( set_eval_bool( irc, set, value ) );
 }
 
@@ -946 +959 @@
         }
         
-        st = gc->acc->prpl->send_im( gc, handle, msg, strlen( msg ), flags );
+        st = gc->prpl->send_im( gc, handle, msg, strlen( msg ), flags );
         g_free( buf );
         
@@ -963 +976 @@
         }
         
-        st = gc->acc->prpl->chat_send( gc, id, msg );
+        st = gc->prpl->chat_send( gc, id, msg );
         g_free( buf );
         
@@ -977 +990 @@
         
         if( !away ) away = "";
-        ms = m = gc->acc->prpl->away_states( gc );
+        ms = m = gc->prpl->away_states( gc );
         
         while( m )
@@ -998 +1011 @@
         if( m )
         {
-                gc->acc->prpl->set_away( gc, m->data, *away ? away : NULL );
+                gc->prpl->set_away( gc, m->data, *away ? away : NULL );
         }
         else
@@ -1005 +1018 @@
                 if( s )
                 {
-                        gc->acc->prpl->set_away( gc, s, away );
-                        if( set_getint( &gc->irc->set, "debug" ) )
+                        gc->prpl->set_away( gc, s, away );
+                        if( set_getint( gc->irc, "debug" ) )
                                 serv_got_crap( gc, "Setting away state to %s", s );
                 }
                 else
-                        gc->acc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
+                        gc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
         }
         
@@ -1062 +1075 @@
 void bim_add_allow( struct gaim_connection *gc, char *handle )
 {
-        if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->handle_cmp ) == NULL )
+        if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
         {
                 gc->permit = g_slist_prepend( gc->permit, g_strdup( handle ) );
         }
         
-        gc->acc->prpl->add_permit( gc, handle );
+        gc->prpl->add_permit( gc, handle );
 }
 
@@ -1074 +1087 @@
         GSList *l;
         
-        if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->handle_cmp ) ) )
+        if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
         {
                 g_free( l->data );
@@ -1080 +1093 @@
         }
         
-        gc->acc->prpl->rem_permit( gc, handle );
+        gc->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->acc->prpl->handle_cmp ) == NULL )
+        if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
         {
                 gc->deny = g_slist_prepend( gc->deny, g_strdup( handle ) );
         }
         
-        gc->acc->prpl->add_deny( gc, handle );
+        gc->prpl->add_deny( gc, handle );
 }
 
@@ -1097 +1110 @@
         GSList *l;
         
-        if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->handle_cmp ) ) )
+        if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
         {
                 g_free( l->data );
@@ -1103 +1116 @@
         }
         
-        gc->acc->prpl->rem_deny( gc, handle );
-}
+        gc->prpl->rem_deny( gc, handle );
+}