Changes in protocols/jabber/jabber.c [f9928cb:38ff846]

File:

• protocols/jabber/jabber.c (modified) (6 diffs)

protocols/jabber/jabber.c

@@ -58 +58 @@
         char str[16];
         
+        s = set_add( &acc->set, "activity_timeout", "600", set_eval_int, acc );
+        
         g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
         s = set_add( &acc->set, "port", str, set_eval_int, acc );
@@ -77 +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 );
@@ -284 +288 @@
                 g_hash_table_destroy( jd->node_cache );
         
+        jabber_buddy_remove_all( ic );
+        
         xt_free( jd->xt );
         
@@ -307 +313 @@
                 bud = jabber_buddy_by_ext_jid( ic, who, 0 );
         else
-                bud = jabber_buddy_by_jid( ic, who, 0 );
+                bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_BARE_OK );
         
         node = xt_new_node( "body", message, NULL );
@@ -352 +358 @@
 static void jabber_get_info( struct im_connection *ic, char *who )
 {
-        struct jabber_data *jd = ic->proto_data;
         struct jabber_buddy *bud;
         
-        if( strchr( who, '/' ) )
-                bud = jabber_buddy_by_jid( ic, who, 0 );
-        else
-        {
-                char *s = jabber_normalize( who );
-                bud = g_hash_table_lookup( jd->buddies, s );
-                g_free( s );
-        }
+        bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_FIRST );
         
         while( bud )
@@ -476 +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