Changeset cfbb3a6 for protocols/jabber

Timestamp:

2006-09-24T18:08:07Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8e5e2e9

Parents:

e101506

Message:

Added add_buddy/remove_buddy functions. Removing a contact doesn't seem
to work perfectly though.

Location:

protocols/jabber

Files:

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

protocols/jabber/iq.c

@@ -184 +184 @@
         return st;
 }
+
+int jabber_add_to_roster( struct gaim_connection *gc, char *handle, char *name )
+{
+        struct xt_node *node;
+        int st;
+        
+        /* Build the item entry */
+        node = xt_new_node( "item", NULL, NULL );
+        xt_add_attr( node, "jid", handle );
+        if( name )
+                xt_add_attr( node, "name", name );
+        
+        /* And pack it into a roster-add packet */
+        node = xt_new_node( "query", NULL, node );
+        xt_add_attr( node, "xmlns", "jabber:iq:roster" );
+        node = jabber_make_packet( "iq", "set", NULL, node );
+        
+        st = jabber_write_packet( gc, node );
+        
+        xt_free_node( node );
+        return st;
+}
+
+int jabber_remove_from_roster( struct gaim_connection *gc, char *handle )
+{
+        struct xt_node *node;
+        int st;
+        
+        /* Build the item entry */
+        node = xt_new_node( "item", NULL, NULL );
+        xt_add_attr( node, "jid", handle );
+        xt_add_attr( node, "subscription", "remove" );
+        
+        /* And pack it into a roster-add packet */
+        node = xt_new_node( "query", NULL, node );
+        xt_add_attr( node, "xmlns", "jabber:iq:roster" );
+        node = jabber_make_packet( "iq", "set", NULL, node );
+        
+        st = jabber_write_packet( gc, node );
+        
+        xt_free_node( node );
+        return st;
+}

protocols/jabber/jabber.c

@@ -153 +153 @@
         
         presence_send_update( gc );
+}
+
+static void jabber_add_buddy( struct gaim_connection *gc, char *who )
+{
+        if( jabber_add_to_roster( gc, who, NULL ) )
+                presence_send_request( gc, who, "subscribe" );
+}
+
+static void jabber_remove_buddy( struct gaim_connection *gc, char *who, char *group )
+{
+        if( jabber_remove_from_roster( gc, who ) )
+                presence_send_request( gc, who, "unsubscribe" );
 }
 
@@ -175 +187 @@
 //      ret->set_info = jabber_set_info;
 //      ret->get_info = jabber_get_info;
-//      ret->add_buddy = jabber_add_buddy;
-//      ret->remove_buddy = jabber_remove_buddy;
+        ret->add_buddy = jabber_add_buddy;
+        ret->remove_buddy = jabber_remove_buddy;
 //      ret->chat_send = jabber_chat_send;
 //      ret->chat_invite = jabber_chat_invite;

protocols/jabber/jabber.h

@@ -73 +73 @@
 int jabber_start_iq_auth( struct gaim_connection *gc );
 int jabber_get_roster( struct gaim_connection *gc );
+int jabber_add_to_roster( struct gaim_connection *gc, char *handle, char *name );
+int jabber_remove_from_roster( struct gaim_connection *gc, char *handle );
 
+/* message.c */
 xt_status jabber_pkt_message( struct xt_node *node, gpointer data );
 
@@ -79 +82 @@
 xt_status jabber_pkt_presence( struct xt_node *node, gpointer data );
 int presence_send_update( struct gaim_connection *gc );
+int presence_send_request( struct gaim_connection *gc, char *handle, char *request );
 
 /* jabber_util.c */

protocols/jabber/presence.c

@@ -78 +78 @@
         return st;
 }
+
+/* Send a subscribe/unsubscribe request to a buddy. */
+int presence_send_request( struct gaim_connection *gc, char *handle, char *request )
+{
+        struct xt_node *node;
+        int st;
+        
+        node = jabber_make_packet( "presence", NULL, NULL, NULL );
+        xt_add_attr( node, "to", handle );
+        xt_add_attr( node, "type", request );
+        
+        st = jabber_write_packet( gc, node );
+        
+        xt_free_node( node );
+        return st;
+}