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

File:

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

protocols/jabber/jabber.c

@@ -65 +65 @@
         
         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 );
@@ -81 +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 );
@@ -266 +266 @@
         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 )
@@ -413 +401 @@
         }
         
-        if( jabber_add_to_roster( ic, who, NULL, group ) )
+        if( jabber_add_to_roster( ic, who, NULL ) )
                 presence_send_request( ic, who, "subscribe" );
 }
@@ -486 +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
@@ -560 +549 @@
         ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;
-        ret->transfer_request = jabber_si_transfer_request;
 
         register_protocol( ret );