Changeset f0cb961 for protocols/nogaim.c

Timestamp:

2007-04-19T06:03:43Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d323394c

Parents:

33dc261

Message:

More API changes: buddy list management. imcb_add_buddy() is now a *real*
callback, it's only called from inside IM-modules. This makes sure a buddy
only gets added to the BitlBee structures if the add was successful. This
gets rid of the weirdness described in #55. Unfortunately for now this
change breaks A) automatic renaming of ICQ contacts (if there are names
stored in the contact list) B) add -tmp.

File:

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

protocols/nogaim.c

@@ -352 +352 @@
 /* list.c */
 
-void add_buddy( struct im_connection *ic, char *group, char *handle, char *realname )
+void imcb_add_buddy( struct im_connection *ic, char *handle, char *group )
 {
         user_t *u;
-        char nick[MAX_NICK_LENGTH+1];
-        char *s;
+        char nick[MAX_NICK_LENGTH+1], *s;
         irc_t *irc = ic->irc;
-        
-        if( set_getbool( &irc->set, "debug" ) && 0 ) /* This message is too useless */
-                imcb_log( ic, "Receiving user add from handle: %s", handle );
         
         if( user_findhandle( ic, handle ) )
@@ -369 +365 @@
                 return;
                 
-                /* Buddy seems to exist already. Let's ignore this request then... */
+                /* Buddy seems to exist already. Let's ignore this request then...
+                   Eventually subsequent calls to this function *should* be possible
+                   when a buddy is in multiple groups. But for now BitlBee doesn't
+                   even support groups so let's silently ignore this for now. */
         }
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( ic->acc, handle, realname ) );
+        strcpy( nick, nick_get( ic->acc, handle, NULL ) );
         
         u = user_add( ic->irc, nick );
         
-        if( !realname || !*realname ) realname = nick;
-        u->realname = g_strdup( realname );
+//      if( !realname || !*realname ) realname = nick;
+//      u->realname = g_strdup( realname );
         
         if( ( s = strchr( handle, '@' ) ) )
@@ -387 +386 @@
         else if( ic->acc->server )
         {
-                char *colon;
-                
-                if( ( colon = strchr( ic->acc->server, ':' ) ) )
-                        u->host = g_strndup( ic->acc->server,
-                                             colon - ic->acc->server );
-                else
-                        u->host = g_strdup( ic->acc->server );
-                
+                u->host = g_strdup( ic->acc->server );
                 u->user = g_strdup( handle );
                 
@@ -415 +407 @@
 }
 
-struct buddy *find_buddy( struct im_connection *ic, char *handle )
+struct buddy *imcb_find_buddy( struct im_connection *ic, char *handle )
 {
         static struct buddy b[1];
@@ -435 +427 @@
 
 
-void serv_buddy_rename( struct im_connection *ic, char *handle, char *realname )
+void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname )
 {
         user_t *u = user_findhandle( ic, handle );
         
-        if( !u ) return;
+        if( !u || !realname ) return;
         
         if( g_strcasecmp( u->realname, realname ) != 0 )
@@ -470 +462 @@
 {
         data->ic->acc->prpl->add_buddy( data->ic, data->handle, NULL );
-        add_buddy( data->ic, NULL, data->handle, data->handle );
+        /* imcb_add_buddy( data->ic, NULL, data->handle, data->handle ); */
         
         return show_got_added_no( w, data );
@@ -505 +497 @@
                 if( g_strcasecmp( set_getstr( &ic->irc->set, "handle_unknown" ), "add" ) == 0 )
                 {
-                        add_buddy( ic, NULL, (char*) handle, NULL );
+                        imcb_add_buddy( ic, (char*) handle, NULL );
                         u = user_findhandle( ic, (char*) handle );
                 }
@@ -609 +601 @@
                         }
                         
-                        add_buddy( ic, NULL, handle, NULL );
+                        imcb_add_buddy( ic, handle, NULL );
                         u = user_findhandle( ic, handle );
                         u->is_private = private;
@@ -779 +771 @@
         if( !u )
         {
-                add_buddy( b->ic, NULL, handle, NULL );
+                imcb_add_buddy( b->ic, handle, NULL );
                 u = user_findhandle( b->ic, handle );
         }