Changes in protocols/jabber/conference.c [bdad407:b2c062d]

File:

• protocols/jabber/conference.c (modified) (2 diffs)

protocols/jabber/conference.c

@@ -234 +234 @@
                             ( strcmp( s, XMLNS_MUC_USER ) == 0 ) )
                         {
-                                struct xt_node *item;
-                                
-                                item = xt_find_node( c->children, "item" );
-                                if( ( s = xt_find_attr( item, "jid" ) ) )
+                                c = xt_find_node( c->children, "item" );
+                                if( ( s = xt_find_attr( c, "jid" ) ) )
                                 {
                                         /* Yay, found what we need. :-) */
@@ -285 +283 @@
         else if( type ) /* type can only be NULL or "unavailable" in this function */
         {
-                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 = '/';
-                }
+                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 )