Changeset 3f81999 for protocols/jabber

Timestamp:

2010-06-03T10:31:46Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

5f8ab6a9

Parents:

fc34fb5 (diff), 2e44b1f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in bitlbee 1.2.4

Location:

protocols/jabber

Files:

• conference.c (modified) (2 diffs)
• iq.c (modified) (1 diff)

protocols/jabber/conference.c

@@ -234 +234 @@
                             ( strcmp( s, XMLNS_MUC_USER ) == 0 ) )
                         {
-                                c = xt_find_node( c->children, "item" );
-                                if( ( s = xt_find_attr( c, "jid" ) ) )
+                                struct xt_node *item;
+                                
+                                item = xt_find_node( c->children, "item" );
+                                if( ( s = xt_find_attr( item, "jid" ) ) )
                                 {
                                         /* Yay, found what we need. :-) */
@@ -283 +285 @@
         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 = '/';
+                if( ( bud->flags & JBFLAG_IS_CHATROOM ) && bud->ext_jid )
+                {
+                        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 = '/';
+                }
                 
                 if( bud == jc->me )

protocols/jabber/iq.c

@@ -51 +51 @@
         {
                 if( !( ( c = xt_find_node( node->children, "query" ) ) ||
-                       ( c = xt_find_node( node->children, "ping" ) ) ) || /* O_o WHAT is wrong with just <query/> ????? */
+                       ( c = xt_find_node( node->children, "ping" ) ) ) ||
                     !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
-                        imcb_log( ic, "Warning: Received incomplete IQ-%s packet", type );
+                        /* Sigh. Who decided to suddenly invent new elements
+                           instead of just sticking with <query/>? */
                         return XT_HANDLED;
                 }