Changes in protocols/jabber/iq.c [f0cb961:40ef702]

File:

• protocols/jabber/iq.c (modified) (3 diffs)

protocols/jabber/iq.c

@@ -99 +99 @@
                 else if( strcmp( s, XMLNS_DISCOVER ) == 0 )
                 {
+                        const char *features[] = { XMLNS_VERSION,
+                                                   XMLNS_TIME,
+                                                   XMLNS_CHATSTATES,
+                                                   XMLNS_MUC,
+                                                   NULL };
+                        const char **f;
+                        
                         c = xt_new_node( "identity", NULL, NULL );
                         xt_add_attr( c, "category", "client" );
@@ -105 +112 @@
                         xt_add_child( reply, c );
                         
-                        c = xt_new_node( "feature", NULL, NULL );
-                        xt_add_attr( c, "var", XMLNS_VERSION );
-                        xt_add_child( reply, c );
-                        
-                        c = xt_new_node( "feature", NULL, NULL );
-                        xt_add_attr( c, "var", XMLNS_TIME );
-                        xt_add_child( reply, c );
-                        
-                        c = xt_new_node( "feature", NULL, NULL );
-                        xt_add_attr( c, "var", XMLNS_CHATSTATES );
-                        xt_add_child( reply, c );
-                        
-                        /* Later this can be useful to announce things like
-                           MUC support. */
+                        for( f = features; *f; f ++ )
+                        {
+                                c = xt_new_node( "feature", NULL, NULL );
+                                xt_add_attr( c, "var", *f );
+                                xt_add_child( reply, c );
+                        }
                 }
                 else
@@ -373 +372 @@
                                                                    group->text : NULL );
                                 
-                                imcb_rename_buddy( ic, jid, name );
+                                if( name )
+                                        imcb_rename_buddy( ic, jid, name );
                         }
                         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 );
                         }
                 }