Changes in / [2378eca2:21a328ab]

Location:

protocols/jabber

Files:

• block.c (modified) (2 diffs)
• iq.c (modified) (3 diffs)
• jabber.h (modified) (1 diff)

protocols/jabber/block.c

@@ -23 +23 @@
 
 #include "jabber.h"
-
-int jabber_block_feature(struct im_connection *ic)
-{
-        struct jabber_data *jd = ic->proto_data;
-        GSList *features = jd->features;
-        int foundbk = FALSE;
-        struct prpl *prpl = ic->acc->prpl;
-
-        while (features) {
-                if (!strcmp(features->data, XMLNS_BLOCK)) {
-                        foundbk = TRUE;
-                }
-                features = g_slist_next(features);
-        }
-
-        if (foundbk) {
-                prpl->add_deny = jabber_buddy_block;
-                prpl->rem_deny = jabber_buddy_unblock;
-                prpl->add_permit = jabber_buddy_permit;
-                prpl->rem_permit = jabber_buddy_unpermit;
-        } else {
-                prpl->add_deny = NULL;
-                prpl->rem_deny = NULL;
-                prpl->add_permit = NULL;
-                prpl->rem_permit = NULL;
-        }
-
-        return foundbk;
-}
 
 void jabber_buddy_blockunblock(struct im_connection *ic, char *who, int block)
@@ -87 +58 @@
 }
 
+//jabber doesn't have permit lists so these are empty
 void jabber_buddy_permit(struct im_connection *ic, char *who)
 {
 }
+
 void jabber_buddy_unpermit(struct im_connection *ic, char *who)
 {

protocols/jabber/iq.c

@@ -1007 +1007 @@
 {
         struct jabber_data *jd = ic->proto_data;
+    struct prpl *prpl = ic->acc->prpl;
         struct xt_node *query, *id, *c;
         char *feature;
@@ -1014 +1015 @@
         }
 
-        c = query->children;
-
-        while ((c = xt_find_node(c, "feature"))) {
-                feature = xt_find_attr(c, "var");
-                if (feature) {
-                        jd->features = g_slist_append(jd->features, g_strdup(feature));
-                }
-                c = c->next;
-        }
+    if (xt_find_node_by_attr(query->children, "feature", "var", XMLNS_BLOCK)) {
+        prpl->add_deny = jabber_buddy_block;
+        prpl->rem_deny = jabber_buddy_unblock;
+        prpl->add_permit = jabber_buddy_permit;
+        prpl->rem_permit = jabber_buddy_unpermit;
+    }
 
         if (xt_find_node_by_attr(query->children, "feature", "var", XMLNS_CARBONS) &&
@@ -1051 +1049 @@
                 }
         }
-
-        jabber_block_feature(ic);
 
         return XT_HANDLED;

protocols/jabber/jabber.h

@@ -109 +109 @@
         GHashTable *buddies;
 
-        GSList *features;
         GSList *filetransfers;
         GSList *streamhosts;