Changes in protocols/jabber/jabber_util.c [5bd21df:608f8cf]

File:

• protocols/jabber/jabber_util.c (modified) (3 diffs)

protocols/jabber/jabber_util.c

@@ -179 +179 @@
                 return FALSE;
         }
-}
-
-xt_status jabber_cache_handle_packet( struct im_connection *ic, struct xt_node *node )
-{
-        struct jabber_data *jd = ic->proto_data;
-        struct jabber_cache_entry *entry;
-        char *s;
-        
-        if( ( s = xt_find_attr( node, "id" ) ) == NULL ||
-            strncmp( s, jd->cached_id_prefix, strlen( jd->cached_id_prefix ) ) != 0 )
-        {
-                /* Silently ignore it, without an ID (or a non-cache
-                   ID) we don't know how to handle the packet and we
-                   probably don't have to. */
-                return XT_HANDLED;
-        }
-        
-        entry = g_hash_table_lookup( jd->node_cache, s );
-        
-        if( entry == NULL )
-        {
-                imcb_log( ic, "WARNING: Received %s-%s packet with unknown/expired ID %s!",
-                              node->name, xt_find_attr( node, "type" ) ? : "(no type)", s );
-        }
-        else if( entry->func )
-        {
-                return entry->func( ic, node, entry->node );
-        }
-        
-        return XT_HANDLED;
 }
 
@@ -614 +584 @@
 }
 
+struct groupchat *jabber_chat_by_name( 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;
+}
+
 time_t jabber_get_timestamp( struct xt_node *xt )
 {
@@ -665 +652 @@
 struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns )
 {
-        struct jabber_error *err;
+        struct jabber_error *err = g_new0( struct jabber_error, 1 );
         struct xt_node *c;
         char *s;
         
-        if( node == NULL )
-                return NULL;
-        
-        err = g_new0( struct jabber_error, 1 );
         err->type = xt_find_attr( node, "type" );