diff options
| author | dequis <dx@dxzone.com.ar> | 2015-05-13 04:01:28 -0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2015-05-13 04:01:28 -0300 |
| commit | 2730c79659ae3b4ca857859a9ade8cfd1cd92ac4 (patch) | |
| tree | ad60a6a4f35e2cea33714a8776c05901ab842fe7 | |
| parent | 5014380af58a2fa51b3ef5afa49d7751eaf6cea1 (diff) | |
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.
| -rw-r--r-- | protocols/msn/ns.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/msn/ns.c b/protocols/msn/ns.c index 0aab149d..906208a7 100644 --- a/protocols/msn/ns.c +++ b/protocols/msn/ns.c @@ -622,7 +622,7 @@ static gboolean msn_ns_send_adl_1(gpointer key, gpointer value, gpointer data) char *domain; 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; } @@ -640,7 +640,7 @@ static gboolean msn_ns_send_adl_1(gpointer key, gpointer value, gpointer data) xt_insert_child(adl, d); } - 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); xt_add_attr(c, "t", "1"); /* FIXME: Network type, i.e. 32 for Y!MSG */ @@ -693,7 +693,7 @@ static void msn_ns_send_adl_start(struct im_connection *ic) bee_user_t *bu = l->data; 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; } |