Changeset 2d317bb

Timestamp:

2007-04-23T05:18:47Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6286f80

Parents:

0e7ab64

Message:

Fixes: handling of being kicked, now sending <presence/> tags to all
conferences the user's in.

Location:

protocols

Files:

• jabber/conference.c (modified) (1 diff)
• jabber/presence.c (modified) (2 diffs)
• jabber/xmltree.c (modified) (1 diff)
• nogaim.c (modified) (3 diffs)

protocols/jabber/conference.c

@@ -163 +163 @@
                 if( bud == jc->me )
                 {
+                        jabber_buddy_remove_bare( ic, jc->name );
+                        
                         g_free( jc->name );
                         g_free( jc );

protocols/jabber/presence.c

@@ -168 +168 @@
         char *show = jd->away_state->code;
         char *status = jd->away_message;
+        struct groupchat *c;
         int st;
         
@@ -179 +180 @@
         st = jabber_write_packet( ic, node );
         
+        /* Have to send this update to all groupchats too, the server won't
+           do this automatically. */
+        for( c = ic->groupchats; c && st; c = c->next )
+        {
+                struct jabber_chat *jc = c->data;
+                
+                xt_add_attr( node, "to", jc->me->full_jid );
+                st = jabber_write_packet( ic, node );
+        }
+        
         xt_free_node( node );
         return st;

protocols/jabber/xmltree.c

@@ -188 +188 @@
                                                g_strcasecmp( xt->handlers[i].parent, "<root>" ) == 0 ) ) )
                         {
-//                              xt_print( node );
+                                xt_print( node );
                                 
                                 st = xt->handlers[i].func( node, xt->data );

protocols/nogaim.c

@@ -807 +807 @@
 }
 
+/* This function is one BIG hack... :-( EREWRITE */
 void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason )
 {
@@ -818 +819 @@
         if( g_strcasecmp( handle, b->ic->acc->user ) == 0 )
         {
+                if( b->joined == 0 )
+                        return;
+                
                 u = user_find( b->ic->irc, b->ic->irc->nick );
                 b->joined = 0;
@@ -827 +831 @@
         }
         
-        if( remove_chat_buddy_silent( b, handle ) )
-                if( ( b->joined || me ) && u )
-                        irc_part( b->ic->irc, u, b->channel );
+        if( me || ( remove_chat_buddy_silent( b, handle ) && b->joined && u ) )
+                irc_part( b->ic->irc, u, b->channel );
 }