Changes in protocols/jabber/io.c [eded1f7:1bf1ae6]

File:

• protocols/jabber/io.c (modified) (7 diffs)

protocols/jabber/io.c

@@ -45 +45 @@
         gboolean ret;
         
-        if( jd->flags & JFLAG_XMLCONSOLE )
-        {
-                char *msg;
-                
-                msg = g_strdup_printf( "TX: %s", buf );
-                imcb_buddy_msg( ic, JABBER_XMLCONSOLE_HANDLE, msg, 0, 0 );
-                g_free( msg );
-        }
-        
         if( jd->tx_len == 0 )
         {
@@ -120 +111 @@
                 return TRUE;
         }
-        else if( st == 0 || ( st < 0 && !ssl_sockerr_again( jd->ssl ) ) )
+        else if( st == 0 || ( st < 0 && !sockerr_again() ) )
         {
                 /* Set fd to -1 to make sure we won't write to it anymore. */
@@ -231 +222 @@
                 }
         }
-        else if( st == 0 || ( st < 0 && !ssl_sockerr_again( jd->ssl ) ) )
+        else if( st == 0 || ( st < 0 && !sockerr_again() ) )
         {
                 closesocket( jd->fd );
@@ -436 +427 @@
 {
         struct im_connection *ic = data;
+        struct xt_node *c;
+        char *s, *type = NULL, *text = NULL;
         int allow_reconnect = TRUE;
-        struct jabber_error *err;
-        
-        err = jabber_error_parse( node, XMLNS_STREAM_ERROR );
+        
+        for( c = node->children; c; c = c->next )
+        {
+                if( !( s = xt_find_attr( c, "xmlns" ) ) ||
+                    strcmp( s, XMLNS_STREAM_ERROR ) != 0 )
+                        continue;
+                
+                if( strcmp( c->name, "text" ) != 0 )
+                {
+                        type = c->name;
+                }
+                /* Only use the text if it doesn't have an xml:lang attribute,
+                   if it's empty or if it's set to something English. */
+                else if( !( s = xt_find_attr( c, "xml:lang" ) ) ||
+                         !*s || strncmp( s, "en", 2 ) == 0 )
+                {
+                        text = c->text;
+                }
+        }
         
         /* Tssk... */
-        if( err->code == NULL )
+        if( type == NULL )
         {
                 imcb_error( ic, "Unknown stream error reported by server" );
                 imc_logout( ic, allow_reconnect );
-                jabber_error_free( err );
                 return XT_ABORT;
         }
@@ -453 +461 @@
            should turn off auto-reconnect to make sure we won't get some nasty
            infinite loop! */
-        if( strcmp( err->code, "conflict" ) == 0 )
+        if( strcmp( type, "conflict" ) == 0 )
         {
                 imcb_error( ic, "Account and resource used from a different location" );
@@ -460 +468 @@
         else
         {
-                imcb_error( ic, "Stream error: %s%s%s", err->code, err->text ? ": " : "",
-                            err->text ? err->text : "" );
-        }
-        
-        jabber_error_free( err );
+                imcb_error( ic, "Stream error: %s%s%s", type, text ? ": " : "", text ? text : "" );
+        }
+        
         imc_logout( ic, allow_reconnect );
         
@@ -470 +476 @@
 }
 
-static xt_status jabber_xmlconsole( struct xt_node *node, gpointer data )
-{
-        struct im_connection *ic = data;
-        struct jabber_data *jd = ic->proto_data;
-        
-        if( jd->flags & JFLAG_XMLCONSOLE )
-        {
-                char *msg, *pkt;
-                
-                pkt = xt_to_string( node );
-                msg = g_strdup_printf( "RX: %s", pkt );
-                imcb_buddy_msg( ic, JABBER_XMLCONSOLE_HANDLE, msg, 0, 0 );
-                g_free( msg );
-                g_free( pkt );
-        }
-        
-        return XT_NEXT;
-}
-
 static const struct xt_handler_entry jabber_handlers[] = {
-        { NULL,                 "stream:stream",        jabber_xmlconsole },
         { "stream:stream",      "<root>",               jabber_end_of_stream },
         { "message",            "stream:stream",        jabber_pkt_message },