Changeset eb6df6a for protocols/jabber

Timestamp:

2010-07-11T17:21:21Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

be999a5

Parents:

3759849 (diff), 00540d4 (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:

merge with upstraem bitlbee 1.2.8

Location:

protocols/jabber

Files:

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

protocols/jabber/iq.c

@@ -65 +65 @@
                 if( strcmp( s, XMLNS_VERSION ) == 0 )
                 {
-                        xt_add_child( reply, xt_new_node( "name", "BitlBee", NULL ) );
+                        xt_add_child( reply, xt_new_node( "name", set_getstr( &ic->acc->set, "user_agent" ), NULL ) );
                         xt_add_child( reply, xt_new_node( "version", BITLBEE_VERSION, NULL ) );
                         xt_add_child( reply, xt_new_node( "os", ARCH, NULL ) );
@@ -105 +105 @@
                         xt_add_attr( c, "category", "client" );
                         xt_add_attr( c, "type", "pc" );
-                        xt_add_attr( c, "name", "BitlBee" );
+                        xt_add_attr( c, "name", set_getstr( &ic->acc->set, "user_agent" ) );
                         xt_add_child( reply, c );
                         

protocols/jabber/jabber.c

@@ -79 +79 @@
         s = set_add( &acc->set, "tls", "try", set_eval_tls, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );
         
         s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc );
@@ -286 +288 @@
                 g_hash_table_destroy( jd->node_cache );
         
+        jabber_buddy_remove_all( ic );
+        
         xt_free( jd->xt );
         
@@ -470 +474 @@
 {
         /* Just any whitespace character is enough as a keepalive for XMPP sessions. */
-        jabber_write( ic, "\n", 1 );
+        if( !jabber_write( ic, "\n", 1 ) )
+                return;
         
         /* This runs the garbage collection every minute, which means every packet

protocols/jabber/jabber.h

@@ -230 +230 @@
 int jabber_buddy_remove( struct im_connection *ic, char *full_jid );
 int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid );
+void jabber_buddy_remove_all( struct im_connection *ic );
 time_t jabber_get_timestamp( struct xt_node *xt );
 struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns );

protocols/jabber/jabber_util.c

@@ -665 +665 @@
 }
 
+static gboolean jabber_buddy_remove_all_cb( gpointer key, gpointer value, gpointer data )
+{
+        struct jabber_buddy *bud, *next;
+        
+        bud = value;
+        while( bud )
+        {
+                next = bud->next;
+                g_free( bud->ext_jid );
+                g_free( bud->full_jid );
+                g_free( bud->away_message );
+                g_free( bud );
+                bud = next;
+        }
+        
+        return TRUE;
+}
+
+void jabber_buddy_remove_all( struct im_connection *ic )
+{
+        struct jabber_data *jd = ic->proto_data;
+        
+        g_hash_table_foreach_remove( jd->buddies, jabber_buddy_remove_all_cb, NULL );
+        g_hash_table_destroy( jd->buddies );
+}
+
 time_t jabber_get_timestamp( struct xt_node *xt )
 {

protocols/jabber/message.c

@@ -55 +55 @@
                         struct xt_node *inv, *reason;
                         
-                        if( strcmp( ns, XMLNS_MUC_USER ) == 0 &&
+                        if( ns && strcmp( ns, XMLNS_MUC_USER ) == 0 &&
                             ( inv = xt_find_node( c->children, "invite" ) ) )
                         {