Changeset 2ecfe39

Timestamp:

2008-02-17T02:12:09Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

d858d21

Parents:

37bff51 (diff), 2d88d25a (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:

more upstream changes

Files:

• protocols/jabber/iq.c (modified) (2 diffs)
• tests/check_help.c (modified) (2 diffs)
• tests/check_jabber_sasl.c (modified) (1 diff)

protocols/jabber/iq.c

@@ -526 +526 @@
 }
 
+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 )
 {
@@ -541 +543 @@
         xt_add_attr( node, "xmlns", XMLNS_ROSTER );
         node = jabber_make_packet( "iq", "set", NULL, node );
+        jabber_cache_add( ic, node, jabber_add_to_roster_callback );
         
         st = jabber_write_packet( ic, node );
         
-        xt_free_node( node );
         return st;
+}
+
+static xt_status jabber_add_to_roster_callback( struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
+{
+        char *s, *jid = NULL;
+        struct xt_node *c;
+        
+        if( ( c = xt_find_node( orig->children, "query" ) ) &&
+            ( c = xt_find_node( c->children, "item" ) ) &&
+            ( jid = xt_find_attr( c, "jid" ) ) &&
+            ( s = xt_find_attr( node, "type" ) ) &&
+            strcmp( s, "result" ) == 0 )
+        {
+                if( imcb_find_buddy( ic, jid ) == NULL )
+                        imcb_add_buddy( ic, jid, NULL );
+        }
+        else
+        {
+                imcb_log( ic, "Error while adding `%s' to your contact list.",
+                          jid ? jid : "(unknown handle)" );
+        }
+        
+        return XT_HANDLED;
 }
 

tests/check_help.c

@@ -7 +7 @@
 #include "help.h"
 
-START_TEST(test_help_none)
+START_TEST(test_help_initfree)
         help_t *h, *r;
         r = help_init(&h, "/dev/null");
         fail_if(r == NULL);
         fail_if(r != h);
+        
+        help_free(&h);
+        fail_if(h != NULL);
 END_TEST
 
@@ -25 +28 @@
         TCase *tc_core = tcase_create("Core");
         suite_add_tcase (s, tc_core);
-        tcase_add_test (tc_core, test_help_none);
+        tcase_add_test (tc_core, test_help_initfree);
         tcase_add_test (tc_core, test_help_nonexistent);
         return s;

tests/check_jabber_sasl.c

@@ -18 +18 @@
 struct
 {
-        const char *challenge;
+        char *challenge;
         char *key;
         char *value;