Changes in protocols/jabber/conference.c [5bd21df:ef5c185]

File:

• protocols/jabber/conference.c (modified) (5 diffs)

protocols/jabber/conference.c

@@ -24 +24 @@
 #include "jabber.h"
 
-static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
-
 struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password )
 {
@@ -37 +35 @@
         xt_add_attr( node, "xmlns", XMLNS_MUC );
         node = jabber_make_packet( "presence", NULL, roomjid, node );
-        jabber_cache_add( ic, node, jabber_chat_join_failed );
         
         if( !jabber_write_packet( ic, node ) )
         {
                 g_free( roomjid );
+                xt_free_node( node );
                 return NULL;
         }
+        xt_free_node( node );
         
         jc = g_new0( struct jabber_chat, 1 );
@@ -64 +63 @@
         
         return c;
-}
-
-static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
-{
-        struct jabber_error *err;
-        struct jabber_buddy *bud;
-        char *room;
-        
-        room = xt_find_attr( orig, "to" );
-        bud = jabber_buddy_by_jid( ic, room, 0 );
-        
-        err = jabber_error_parse( xt_find_node( node->children, "error" ), XMLNS_STANZA_ERROR );
-        if( err )
-        {
-                imcb_error( ic, "Error joining groupchat %s: %s%s%s",
-                            bud->bare_jid, err->code, err->text ? ": " : "",
-                            err->text ? err->text : "" );
-                jabber_error_free( err );
-        }
-        
-        if( bud )
-                jabber_chat_free( jabber_chat_by_jid( ic, bud->bare_jid ) );
-}
-
-struct groupchat *jabber_chat_by_jid( struct im_connection *ic, const char *name )
-{
-        char *normalized = jabber_normalize( name );
-        struct groupchat *ret;
-        struct jabber_chat *jc;
-        
-        for( ret = ic->groupchats; ret; ret = ret->next )
-        {
-                jc = ret->data;
-                if( strcmp( normalized, jc->name ) == 0 )
-                        break;
-        }
-        g_free( normalized );
-        
-        return ret;
 }
 
@@ -188 +148 @@
         char *s;
         
-        if( ( chat = jabber_chat_by_jid( ic, bud->bare_jid ) ) == NULL )
+        if( ( chat = jabber_chat_by_name( ic, bud->bare_jid ) ) == NULL )
         {
                 /* How could this happen?? We could do kill( self, 11 )
@@ -290 +250 @@
                 return;
         }
-        else if( ( chat = jabber_chat_by_jid( ic, bud->bare_jid ) ) == NULL )
+        else if( ( chat = jabber_chat_by_name( ic, bud->bare_jid ) ) == NULL )
         {
                 /* How could this happen?? We could do kill( self, 11 )