Changes in protocols/jabber/jabber.c [eded1f7:de03374]

File:

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

protocols/jabber/jabber.c

@@ -76 +76 @@
         jd->username = g_strdup( acc->user );
         jd->server = strchr( jd->username, '@' );
+        
+        jd->fd = jd->r_inpa = jd->w_inpa = -1;
         
         if( jd->server == NULL )
@@ -232 +234 @@
         struct jabber_data *jd = ic->proto_data;
         
-        jabber_end_stream( ic );
+        if( jd->fd >= 0 )
+                jabber_end_stream( ic );
         
         while( ic->groupchats )
@@ -250 +253 @@
                 g_free( jd->txq );
         
-        g_hash_table_destroy( jd->node_cache );
+        if( jd->node_cache )
+                g_hash_table_destroy( jd->node_cache );
         
         xt_free( jd->xt );
@@ -421 +425 @@
         if( c )
                 jabber_chat_leave( c, NULL );
-}
-
-static void jabber_chat_invite_( struct groupchat *c, char *who, char *msg )
-{
-        struct jabber_chat *jc = c->data;
-        gchar *msg_alt = NULL;
-
-        if( msg == NULL )
-                msg_alt = g_strdup_printf( "%s invited you to %s", c->ic->acc->user, jc->name );
-        
-        if( c && who )
-                jabber_chat_invite( c, who, msg ? msg : msg_alt );
-        
-        g_free( msg_alt );
 }
 
@@ -508 +498 @@
         ret->chat_msg = jabber_chat_msg_;
         ret->chat_topic = jabber_chat_topic_;
-        ret->chat_invite = jabber_chat_invite_;
+//      ret->chat_invite = jabber_chat_invite;
         ret->chat_leave = jabber_chat_leave_;
         ret->chat_join = jabber_chat_join_;
@@ -514 +504 @@
         ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;
-        ret->transfer_request = jabber_si_transfer_request;
 
         register_protocol( ret );