Changeset 998b103

Timestamp:

2007-06-13T23:31:39Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

bdda9e9

Parents:

43d8cc5

Message:

Added imcb_remove_buddy() so deletions in Jabber roster pushes actually
work. This also solves the issue of underscores appearing and disappearing
in their nicknames when people leave/join a chat.

Files:

• bitlbee.c (modified) (2 diffs)
• protocols/jabber/conference.c (modified) (1 diff)
• protocols/jabber/iq.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)

bitlbee.c

@@ -70 +70 @@
 #ifdef IPV6
         memset( &listen_addr6, 0, sizeof( listen_addr6 ) );
+        memset( &listen_addr, 0, sizeof( listen_addr ) );
         listen_addr6.sin6_family = AF_INET6;
         listen_addr6.sin6_port = htons( global.conf->port );
@@ -77 +78 @@
                 use_ipv6 = 0;
 #endif
-                memset( &listen_addr, 0, sizeof( listen_addr ) );
                 listen_addr.sin_family = AF_INET;
                 listen_addr.sin_port = htons( global.conf->port );

protocols/jabber/conference.c

@@ -167 +167 @@
                 if( s ) *s = '/';
         }
-        else if( type ) /* This only gets called if type is NULL or "unavailable" */
+        else if( type ) /* type can only be NULL or "unavailable" in this function */
         {
                 s = strchr( bud->ext_jid, '/' );
                 if( s ) *s = 0;
                 imcb_chat_remove_buddy( chat, bud->ext_jid, NULL );
+                if( bud != jc->me && bud->flags & JBFLAG_IS_ANONYMOUS )
+                        imcb_remove_buddy( ic, bud->ext_jid, NULL );
                 if( s ) *s = '/';
                 

protocols/jabber/iq.c

@@ -378 +378 @@
                         else if( strcmp( sub, "remove" ) == 0 )
                         {
-                                /* Don't have any API call for this yet! So let's
-                                   just try to handle this as well as we can. */
                                 jabber_buddy_remove_bare( ic, jid );
-                                imcb_buddy_status( ic, jid, 0, NULL, NULL );
-                                /* FIXME! */
+                                imcb_remove_buddy( ic, jid, NULL );
                         }
                 }

protocols/jabber/jabber.c

@@ -334 +334 @@
         {
                 jd->flags &= ~JFLAG_XMLCONSOLE;
-                /* FIXME imcb_remove_buddy( ic, JABBER_XMLCONSOLE_HANDLE, NULL ); */
+                imcb_remove_buddy( ic, JABBER_XMLCONSOLE_HANDLE, NULL );
                 return;
         }

protocols/nogaim.c

@@ -440 +440 @@
                         imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
+}
+
+void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group )
+{
+        user_t *u;
+        
+        if( ( u = user_findhandle( ic, handle ) ) )
+                user_del( ic->irc, u->nick );
 }