Changeset 46d215d for protocols

Timestamp:

2010-06-08T23:43:13Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6acc033

Parents:

d7db346

Message:

Allow moving contacts around between groups. Works with at least Jabber,
will check the others now.

Location:

protocols/jabber

Files:

• iq.c (modified) (2 diffs)
• jabber.c (modified) (1 diff)
• jabber.h (modified) (1 diff)

protocols/jabber/iq.c

@@ -555 +555 @@
 static xt_status jabber_add_to_roster_callback( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
 
-int jabber_add_to_roster( struct im_connection *ic, char *handle, char *name )
+int jabber_add_to_roster( struct im_connection *ic, const char *handle, const char *name, const char *group )
 {
         struct xt_node *node;
@@ -565 +565 @@
         if( name )
                 xt_add_attr( node, "name", name );
+        if( group )
+                xt_add_child( node, xt_new_node( "group", group, NULL ) );
         
         /* And pack it into a roster-add packet */

protocols/jabber/jabber.c

@@ -413 +413 @@
         }
         
-        if( jabber_add_to_roster( ic, who, NULL ) )
+        if( jabber_add_to_roster( ic, who, NULL, group ) )
                 presence_send_request( ic, who, "subscribe" );
 }

protocols/jabber/jabber.h

@@ -235 +235 @@
 int jabber_get_roster( struct im_connection *ic );
 int jabber_get_vcard( struct im_connection *ic, char *bare_jid );
-int jabber_add_to_roster( struct im_connection *ic, char *handle, char *name );
+int jabber_add_to_roster( struct im_connection *ic, const char *handle, const char *name, const char *group );
 int jabber_remove_from_roster( struct im_connection *ic, char *handle );
 xt_status jabber_iq_query_features( struct im_connection *ic, char *bare_jid );