Changes in protocols/nogaim.c [449a51d:17a6ee9]

File:

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

protocols/nogaim.c

@@ -38 +38 @@
 #include "chat.h"
 
-static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
-
 GSList *connections;
 
@@ -91 +89 @@
 }
 #endif
-
-/* nogaim.c */
 
 GList *protocols = NULL;
@@ -125 +121 @@
 }
 
-/* nogaim.c */
 void nogaim_init()
 {
@@ -156 +151 @@
 GSList *get_connections() { return connections; }
 
-/* multi.c */
-
 struct im_connection *imcb_new( account_t *acc )
 {
@@ -164 +157 @@
         ic = g_new0( struct im_connection, 1 );
         
-        ic->irc = acc->irc;
+        ic->bee = acc->bee;
         ic->acc = acc;
         acc->ic = ic;
@@ -178 +171 @@
         
         /* Destroy the pointer to this connection from the account list */
-        for( a = ic->irc->accounts; a; a = a->next )
+        for( a = ic->bee->accounts; a; a = a->next )
                 if( a->ic == ic )
                 {
@@ -199 +192 @@
         va_end( params );
 
-        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &ic->bee->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->bee->set, "strip_html" ) ) )
                 strip_html( text );
         
         /* Try to find a different connection on the same protocol. */
-        for( a = ic->irc->accounts; a; a = a->next )
+        for( a = ic->bee->accounts; a; a = a->next )
                 if( a->prpl == ic->acc->prpl && a->ic != ic )
                         break;
@@ -210 +203 @@
         /* If we found one, include the screenname in the message. */
         if( a )
-                irc_usermsg( ic->irc, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
+                /* FIXME(wilmer): ui_log callback or so */
+                irc_usermsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
         else
-                irc_usermsg( ic->irc, "%s - %s", ic->acc->prpl->name, text );
+                irc_usermsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );
         
         g_free( text );
@@ -263 +257 @@
 void imcb_connected( struct im_connection *ic )
 {
-        irc_t *irc = ic->irc;
-        struct chat *c;
-        user_t *u;
-        
         /* MSN servers sometimes redirect you to a different server and do
            the whole login sequence again, so these "late" calls to this
@@ -273 +263 @@
                 return;
         
-        u = user_find( ic->irc, ic->irc->nick );
-        
         imcb_log( ic, "Logged in" );
         
@@ -287 +275 @@
         ic->acc->auto_reconnect_delay = 0;
         
+        /*
         for( c = irc->chatrooms; c; c = c->next )
         {
@@ -295 +284 @@
                         chat_join( irc, c, NULL );
         }
+        */
 }
 
@@ -302 +292 @@
         
         a->reconnect = 0;
-        account_on( a->irc, a );
+        account_on( a->bee, a );
         
         return( FALSE );        /* Only have to run the timeout once */
@@ -315 +305 @@
 void imc_logout( struct im_connection *ic, int allow_reconnect )
 {
-        irc_t *irc = ic->irc;
-        user_t *t, *u;
+        bee_t *bee = ic->bee;
         account_t *a;
+        GSList *l;
         int delay;
         
@@ -337 +327 @@
         ic->away = NULL;
         
-        u = irc->users;
-        while( u )
-        {
-                if( u->ic == ic )
-                {
-                        t = u->next;
-                        user_del( irc, u->nick );
-                        u = t;
-                }
-                else
-                        u = u->next;
-        }
-        
-        query_del_by_conn( ic->irc, ic );
-        
-        for( a = irc->accounts; a; a = a->next )
+        for( l = bee->users; l; l = l->next )
+        {
+                bee_user_t *bu = l->data;
+                
+                if( bu->ic == ic )
+                        bee_user_free( bee, ic, bu->handle );
+        }
+        
+        //query_del_by_conn( ic->irc, ic );
+        
+        for( a = bee->accounts; a; a = a->next )
                 if( a->ic == ic )
                         break;
@@ -360 +345 @@
                 /* Uhm... This is very sick. */
         }
-        else if( allow_reconnect && set_getbool( &irc->set, "auto_reconnect" ) &&
+        else if( allow_reconnect && set_getbool( &bee->set, "auto_reconnect" ) &&
                  set_getbool( &a->set, "auto_reconnect" ) &&
                  ( delay = account_reconnect_delay( a ) ) > 0 )
@@ -371 +356 @@
 }
 
-
-/* dialogs.c */
-
 void imcb_ask( struct im_connection *ic, char *msg, void *data,
                query_callback doit, query_callback dont )
 {
-        query_add( ic->irc, ic, msg, doit, dont, data );
-}
-
-
-/* list.c */
+        //query_add( ic->irc, ic, msg, doit, dont, data );
+}
 
 void imcb_add_buddy( struct im_connection *ic, const char *handle, const char *group )
 {
-        user_t *u;
-        char nick[MAX_NICK_LENGTH+1], *s;
-        irc_t *irc = ic->irc;
-        
-        if( user_findhandle( ic, handle ) )
-        {
-                if( set_getbool( &irc->set, "debug" ) )
+        bee_user_t *bu;
+        bee_t *bee = ic->bee;
+        
+        if( bee_user_by_handle( bee, ic, handle ) )
+        {
+                if( set_getbool( &bee->set, "debug" ) )
                         imcb_log( ic, "User already exists, ignoring add request: %s", handle );
                 
@@ -402 +380 @@
         }
         
-        memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( ic->acc, handle ) );
-        
-        u = user_add( ic->irc, nick );
-        
-//      if( !realname || !*realname ) realname = nick;
-//      u->realname = g_strdup( realname );
-        
-        if( ( s = strchr( handle, '@' ) ) )
-        {
-                u->host = g_strdup( s + 1 );
-                u->user = g_strndup( handle, s - handle );
-        }
-        else if( ic->acc->server )
-        {
-                u->host = g_strdup( ic->acc->server );
-                u->user = g_strdup( handle );
-                
-                /* s/ /_/ ... important for AOL screennames */
-                for( s = u->user; *s; s ++ )
-                        if( *s == ' ' )
-                                *s = '_';
-        }
-        else
-        {
-                u->host = g_strdup( ic->acc->prpl->name );
-                u->user = g_strdup( handle );
-        }
-        
-        u->ic = ic;
-        u->handle = g_strdup( handle );
-        if( group ) u->group = g_strdup( group );
-        u->send_handler = buddy_send_handler;
-        u->last_typing_notice = 0;
-}
-
-struct buddy *imcb_find_buddy( struct im_connection *ic, char *handle )
-{
-        static struct buddy b[1];
-        user_t *u;
-        
-        u = user_findhandle( ic, handle );
-        
-        if( !u )
-                return( NULL );
-        
-        memset( b, 0, sizeof( b ) );
-        strncpy( b->name, handle, 80 );
-        strncpy( b->show, u->realname, BUDDY_ALIAS_MAXLEN );
-        b->present = u->online;
-        b->ic = u->ic;
-        
-        return( b );
-}
-
-void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname )
-{
-        user_t *u = user_findhandle( ic, handle );
-        char *set;
-        
-        if( !u || !realname ) return;
-        
-        if( g_strcasecmp( u->realname, realname ) != 0 )
-        {
-                if( u->realname != u->nick ) g_free( u->realname );
-                
-                u->realname = g_strdup( realname );
-                
-                if( ( ic->flags & OPT_LOGGED_IN ) && set_getbool( &ic->irc->set, "display_namechanges" ) )
-                        imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
-        }
-        
-        set = set_getstr( &ic->acc->set, "nick_source" );
-        if( strcmp( set, "handle" ) != 0 )
-        {
-                char *name = g_strdup( realname );
-                
-                if( strcmp( set, "first_name" ) == 0 )
-                {
-                        int i;
-                        for( i = 0; name[i] && !isspace( name[i] ); i ++ ) {}
-                        name[i] = '\0';
-                }
-                
-                imcb_buddy_nick_hint( ic, handle, name );
-                
-                g_free( name );
+        bu = bee_user_new( bee, ic, handle );
+        bu->group = g_strdup( group );
+}
+
+void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *fullname )
+{
+        bee_t *bee = ic->bee;
+        bee_user_t *bu = bee_user_by_handle( bee, ic, handle );
+        
+        if( !bu || !fullname ) return;
+        
+        if( !bu->fullname || strcmp( bu->fullname, fullname ) != 0 )
+        {
+                g_free( bu->fullname );
+                bu->fullname = g_strdup( fullname );
+                
+                if( bee->ui->user_fullname )
+                        bee->ui->user_fullname( bee, bu );
         }
 }
@@ -494 +403 @@
 void imcb_remove_buddy( struct im_connection *ic, const char *handle, char *group )
 {
-        user_t *u;
-        
-        if( ( u = user_findhandle( ic, handle ) ) )
-                user_del( ic->irc, u->nick );
+        bee_user_free( ic->bee, ic, handle );
 }
 
@@ -504 +410 @@
 void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick )
 {
+#if 0
         user_t *u = user_findhandle( ic, handle );
         char newnick[MAX_NICK_LENGTH+1], *orig_nick;
@@ -518 +425 @@
                 /* Some processing to make sure this string is a valid IRC nickname. */
                 nick_strip( newnick );
-                if( set_getbool( &ic->irc->set, "lcnicks" ) )
+                if( set_getbool( &ic->bee->set, "lcnicks" ) )
                         nick_lc( newnick );
                 
@@ -535 +442 @@
                 }
         }
+#endif
 }
 
@@ -544 +452 @@
 };
 
+#if 0
 static void imcb_ask_auth_cb_no( void *data )
 {
@@ -563 +472 @@
         g_free( cbd );
 }
+#endif
 
 void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *realname )
 {
+#if 0
         struct imcb_ask_cb_data *data = g_new0( struct imcb_ask_cb_data, 1 );
         char *s, *realname_ = NULL;
@@ -580 +491 @@
         data->handle = g_strdup( handle );
         query_add( ic->irc, ic, s, imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, data );
-}
-
-
+#endif
+}
+
+
+#if 0
 static void imcb_ask_add_cb_no( void *data )
 {
@@ -597 +510 @@
         return imcb_ask_add_cb_no( data );
 }
+#endif
 
 void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname )
 {
+#if 0
         struct imcb_ask_cb_data *data = g_new0( struct imcb_ask_cb_data, 1 );
         char *s;
@@ -612 +527 @@
         data->handle = g_strdup( handle );
         query_add( ic->irc, ic, s, imcb_ask_add_cb_yes, imcb_ask_add_cb_no, data );
-}
-
-
-/* server.c */                    
-
-void imcb_buddy_status( struct im_connection *ic, const char *handle, int flags, const char *state, const char *message )
-{
+#endif
+}
+
+void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags )
+{
+#if 0
         user_t *u;
-        int oa, oo;
-        
-        u = user_findhandle( ic, (char*) handle );
-        
-        if( !u )
-        {
-                if( g_strcasecmp( set_getstr( &ic->irc->set, "handle_unknown" ), "add" ) == 0 )
-                {
-                        imcb_add_buddy( ic, (char*) handle, NULL );
-                        u = user_findhandle( ic, (char*) handle );
-                }
-                else
-                {
-                        if( set_getbool( &ic->irc->set, "debug" ) || g_strcasecmp( set_getstr( &ic->irc->set, "handle_unknown" ), "ignore" ) != 0 )
-                        {
-                                imcb_log( ic, "imcb_buddy_status() for unknown handle %s:", handle );
-                                imcb_log( ic, "flags = %d, state = %s, message = %s", flags,
-                                          state ? state : "NULL", message ? message : "NULL" );
-                        }
-                        
-                        return;
-                }
-        }
-        
-        oa = u->away != NULL;
-        oo = u->online;
-        
-        g_free( u->away );
-        g_free( u->status_msg );
-        u->away = u->status_msg = NULL;
-        
-        if( ( flags & OPT_LOGGED_IN ) && !u->online )
-        {
-                irc_spawn( ic->irc, u );
-                u->online = 1;
-        }
-        else if( !( flags & OPT_LOGGED_IN ) && u->online )
-        {
-                struct groupchat *c;
-                
-                irc_kill( ic->irc, u );
-                u->online = 0;
-                
-                /* Remove him/her from the groupchats to prevent PART messages after he/she QUIT already */
-                for( c = ic->groupchats; c; c = c->next )
-                        remove_chat_buddy_silent( c, handle );
-        }
-        
-        if( flags & OPT_AWAY )
-        {
-                if( state && message )
-                {
-                        u->away = g_strdup_printf( "%s (%s)", state, message );
-                }
-                else if( state )
-                {
-                        u->away = g_strdup( state );
-                }
-                else if( message )
-                {
-                        u->away = g_strdup( message );
-                }
-                else
-                {
-                        u->away = g_strdup( "Away" );
-                }
-        }
-        else
-        {
-                u->status_msg = g_strdup( message );
-        }
-        
-        /* LISPy... */
-        if( ( set_getbool( &ic->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 */
-              ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* (De)voice people changing state */
-        {
-                char *from;
-                
-                if( set_getbool( &ic->irc->set, "simulate_netsplit" ) )
-                {
-                        from = g_strdup( ic->irc->myhost );
-                }
-                else
-                {
-                        from = g_strdup_printf( "%s!%s@%s", ic->irc->mynick, ic->irc->mynick,
-                                                            ic->irc->myhost );
-                }
-                irc_write( ic->irc, ":%s MODE %s %cv %s", from, ic->irc->channel,
-                                                          u->away?'-':'+', u->nick );
-                g_free( from );
-        }
-}
-
-void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at )
-{
-        irc_t *irc = ic->irc;
-        char *wrapped;
-        user_t *u;
-        
-        u = user_findhandle( ic, handle );
-        
-        if( !u )
-        {
-                char *h = set_getstr( &irc->set, "handle_unknown" );
-                
-                if( g_strcasecmp( h, "ignore" ) == 0 )
-                {
-                        if( set_getbool( &irc->set, "debug" ) )
-                                imcb_log( ic, "Ignoring message from unknown handle %s", handle );
-                        
-                        return;
-                }
-                else if( g_strncasecmp( h, "add", 3 ) == 0 )
-                {
-                        int private = set_getbool( &irc->set, "private" );
-                        
-                        if( h[3] )
-                        {
-                                if( g_strcasecmp( h + 3, "_private" ) == 0 )
-                                        private = 1;
-                                else if( g_strcasecmp( h + 3, "_channel" ) == 0 )
-                                        private = 0;
-                        }
-                        
-                        imcb_add_buddy( ic, handle, NULL );
-                        u = user_findhandle( ic, handle );
-                        u->is_private = private;
-                }
-                else
-                {
-                        imcb_log( ic, "Message from unknown handle %s:", handle );
-                        u = user_find( irc, irc->mynick );
-                }
-        }
-        
-        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
-                strip_html( msg );
-
-        wrapped = word_wrap( msg, 425 );
-        irc_msgfrom( irc, u->nick, wrapped );
-        g_free( wrapped );
-}
-
-void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags )
-{
-        user_t *u;
-        
-        if( !set_getbool( &ic->irc->set, "typing_notice" ) )
+        
+        if( !set_getbool( &ic->bee->set, "typing_notice" ) )
                 return;
         
@@ -780 +545 @@
                 irc_privmsg( ic->irc, u, "PRIVMSG", ic->irc->nick, NULL, buf );
         }
+#endif
+}
+
+struct bee_user *imcb_buddy_by_handle( struct im_connection *ic, const char *handle )
+{
+        return bee_user_by_handle( ic->bee, ic, handle );
 }
 
 struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle )
 {
+#if 0
         struct groupchat *c;
         
@@ -801 +573 @@
         c->topic = g_strdup_printf( "BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!", c->title );
         
-        if( set_getbool( &ic->irc->set, "debug" ) )
+        if( set_getbool( &ic->bee->set, "debug" ) )
                 imcb_log( ic, "Creating new conversation: (id=%p,handle=%s)", c, handle );
         
         return c;
+#endif
+        return NULL;
 }
 
 void imcb_chat_free( struct groupchat *c )
 {
+#if 0
         struct im_connection *ic = c->ic;
         struct groupchat *l;
         GList *ir;
         
-        if( set_getbool( &ic->irc->set, "debug" ) )
+        if( set_getbool( &ic->bee->set, "debug" ) )
                 imcb_log( ic, "You were removed from conversation %p", c );
         
@@ -846 +621 @@
                 g_free( c );
         }
+#endif
 }
 
 void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at )
 {
+#if 0
         struct im_connection *ic = c->ic;
         char *wrapped;
@@ -860 +637 @@
         u = user_findhandle( ic, who );
         
-        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &ic->bee->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->bee->set, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -874 +651 @@
         }
         g_free( wrapped );
+#endif
 }
 
 void imcb_chat_log( struct groupchat *c, char *format, ... )
 {
+#if 0
         irc_t *irc = c->ic->irc;
         va_list params;
@@ -892 +671 @@
         
         g_free( text );
+#endif
 }
 
 void imcb_chat_topic( struct groupchat *c, char *who, char *topic, time_t set_at )
 {
+#if 0
         struct im_connection *ic = c->ic;
         user_t *u = NULL;
@@ -906 +687 @@
                 u = user_findhandle( ic, who );
         
-        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &ic->bee->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->bee->set, "strip_html" ) ) )
                 strip_html( topic );
         
@@ -915 +696 @@
         if( c->joined && u )
                 irc_write( ic->irc, ":%s!%s@%s TOPIC %s :%s", u->nick, u->user, u->host, c->channel, topic );
-}
-
-
-/* buddy_chat.c */
+#endif
+}
 
 void imcb_chat_add_buddy( struct groupchat *b, const char *handle )
 {
+#if 0
         user_t *u = user_findhandle( b->ic, handle );
         int me = 0;
         
-        if( set_getbool( &b->ic->irc->set, "debug" ) )
+        if( set_getbool( &b->ic->bee->set, "debug" ) )
                 imcb_log( b->ic, "User %s added to conversation %p", handle, b );
         
@@ -952 +732 @@
                 b->in_room = g_list_append( b->in_room, g_strdup( handle ) );
         }
+#endif
 }
 
@@ -957 +738 @@
 void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason )
 {
+#if 0
         user_t *u;
         int me = 0;
         
-        if( set_getbool( &b->ic->irc->set, "debug" ) )
+        if( set_getbool( &b->ic->bee->set, "debug" ) )
                 imcb_log( b->ic, "User %s removed from conversation %p (%s)", handle, b, reason ? reason : "" );
         
@@ -980 +762 @@
         if( me || ( remove_chat_buddy_silent( b, handle ) && b->joined && u ) )
                 irc_part( b->ic->irc, u, b->channel );
-}
-
+#endif
+}
+
+#if 0
 static int remove_chat_buddy_silent( struct groupchat *b, const char *handle )
 {
@@ -1000 +784 @@
         }
         
-        return( 0 );
-}
+        return 0;
+}
+#endif
 
 
 /* Misc. BitlBee stuff which shouldn't really be here */
-
+#if 0
 char *set_eval_away_devoice( set_t *set, char *value )
 {
@@ -1018 +803 @@
         /* Horror.... */
         
-        if( st != set_getbool( &irc->set, "away_devoice" ) )
+        if( st != set_getbool( &irc->b->set, "away_devoice" ) )
         {
                 char list[80] = "";
@@ -1060 +845 @@
         return value;
 }
-
+#endif
 
 
@@ -1067 +852 @@
    them all from some wrappers. We'll start to define some down here: */
 
-int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags )
+int imc_chat_msg( struct groupchat *c, char *msg, int flags )
 {
         char *buf = NULL;
-        int st;
-        
-        if( ( ic->flags & OPT_DOES_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        
+        if( ( c->ic->flags & OPT_DOES_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
         {
                 buf = escape_html( msg );
@@ -1078 +862 @@
         }
         
-        st = ic->acc->prpl->buddy_msg( ic, handle, msg, flags );
-        g_free( buf );
-        
-        return st;
-}
-
-int imc_chat_msg( struct groupchat *c, char *msg, int flags )
-{
-        char *buf = NULL;
-        
-        if( ( c->ic->flags & OPT_DOES_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
-        {
-                buf = escape_html( msg );
-                msg = buf;
-        }
-        
         c->ic->acc->prpl->chat_msg( c, msg, flags );
         g_free( buf );
@@ -1107 +875 @@
         
         away = set_getstr( &ic->acc->set, "away" ) ?
-             : set_getstr( &ic->irc->set, "away" );
+             : set_getstr( &ic->bee->set, "away" );
         if( away && *away )
         {
@@ -1118 +886 @@
                 away = NULL;
                 msg = set_getstr( &ic->acc->set, "status" ) ?
-                    : set_getstr( &ic->irc->set, "status" );
+                    : set_getstr( &ic->bee->set, "status" );
         }