Changeset 21a328ab for protocols/jabber/block.c

Timestamp:

2021-04-16T10:15:47Z (4 years ago)

Author:

/ <>

Parents:

2378eca2 (diff), 416b973 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jabberblock' into integration_tests

File:

• protocols/jabber/block.c (modified) (2 diffs)

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)
 {