Changeset 2730c79

Timestamp:

2015-05-13T07:01:28Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

a733669

Parents:

5014380

Message:

msn: Fix "ADL/RML command with invalid modification" errors

The previous value (7) was FL | AL | BL, and the block role was replaced
with "Hide" in msnp21, so the server was rejecting the parts of the ADL
that had it. And since adding blocked contacts isn't very useful anyway,
this is like silencing an annoying warning.

File:

• protocols/msn/ns.c (modified) (3 diffs)

protocols/msn/ns.c

@@ -623 +623 @@
         char l[4];
 
-        if ((bd->flags & 7) == 0 || (bd->flags & MSN_BUDDY_ADL_SYNCED)) {
+        if ((bd->flags & (MSN_BUDDY_FL | MSN_BUDDY_AL)) == 0 || (bd->flags & MSN_BUDDY_ADL_SYNCED)) {
                 return FALSE;
         }
@@ -641 +641 @@
         }
 
-        g_snprintf(l, sizeof(l), "%d", bd->flags & 7);
+        g_snprintf(l, sizeof(l), "%d", bd->flags & (MSN_BUDDY_FL | MSN_BUDDY_AL));
         c = xt_new_node("c", NULL, NULL);
         xt_add_attr(c, "n", handle);
@@ -694 +694 @@
                 struct msn_buddy_data *bd = bu->data;
 
-                if (bu->ic != ic || (bd->flags & 7) == 0) {
+                if (bu->ic != ic || (bd->flags & (MSN_BUDDY_FL | MSN_BUDDY_AL)) == 0) {
                         continue;
                 }