Changes in protocols/jabber/jabber.c [aea8b68:f9928cb]

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 );
@@ -65 +63 @@
         
         s = set_add( &acc->set, "priority", "0", set_eval_priority, acc );
-
-        s = set_add( &acc->set, "proxy", "<local>;<auto>", NULL, acc );
         
         s = set_add( &acc->set, "resource", "BitlBee", NULL, acc );
@@ -266 +262 @@
         struct jabber_data *jd = ic->proto_data;
         
-        while( jd->filetransfers )
-                imcb_file_canceled( ic, ( ( struct jabber_transfer *) jd->filetransfers->data )->ft, "Logging out" );
-
-        while( jd->streamhosts )
-        {
-                jabber_streamhost_t *sh = jd->streamhosts->data;
-                jd->streamhosts = g_slist_remove( jd->streamhosts, sh );
-                g_free( sh->jid );
-                g_free( sh->host );
-                g_free( sh );
-        }
-
         if( jd->fd >= 0 )
                 jabber_end_stream( ic );
         
         while( ic->groupchats )
-                jabber_chat_free( ic->groupchats->data );
+                jabber_chat_free( ic->groupchats );
         
         if( jd->r_inpa >= 0 )
@@ -323 +307 @@
                 bud = jabber_buddy_by_ext_jid( ic, who, 0 );
         else
-                bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_BARE_OK );
+                bud = jabber_buddy_by_jid( ic, who, 0 );
         
         node = xt_new_node( "body", message, NULL );
@@ -368 +352 @@
 static void jabber_get_info( struct im_connection *ic, char *who )
 {
+        struct jabber_data *jd = ic->proto_data;
         struct jabber_buddy *bud;
         
-        bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_FIRST );
+        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 );
+        }
         
         while( bud )
@@ -558 +550 @@
         ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;
-        ret->transfer_request = jabber_si_transfer_request;
 
         register_protocol( ret );