diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-12-06 16:28:34 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2012-12-06 16:28:34 +0000 |
| commit | c7d2dfbe19eb5a3c1c9dfbefa61fb48b3416e064 (patch) | |
| tree | 2a066d63f056bc36303ac474550aad097cdd55cf /src | |
| parent | 3fe57e731b2518e22ba21efb4d16f50564363a2f (diff) | |
| parent | 3b10a7f1b0fcb728210eb12231df8b1a4c289c3b (diff) | |
Merge branch 'telepathy-gabble-0.16'
Diffstat (limited to 'src')
| -rw-r--r-- | src/conn-presence.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/conn-presence.c b/src/conn-presence.c index a17d2a72d..147ff495c 100644 --- a/src/conn-presence.c +++ b/src/conn-presence.c @@ -707,10 +707,7 @@ create_invisible_privacy_list_reply_cb (GabbleConnection *conn, GError *error = NULL; if (wocky_stanza_extract_errors (reply_msg, NULL, &error, NULL, NULL)) - { - g_simple_async_result_set_from_error (result, error); - g_free (error); - } + g_simple_async_result_take_error (result, error); g_simple_async_result_complete_in_idle (result); @@ -1291,10 +1288,10 @@ verify_invisible_privacy_list_cb (GabbleConnection *conn, if (query_node != NULL) list_node = wocky_node_get_child (query_node, "list"); - if (!wocky_stanza_extract_errors (reply_msg, NULL, &error, NULL, NULL) && - list_node != NULL) + if (!wocky_stanza_extract_errors (reply_msg, NULL, &error, NULL, NULL)) { - if (!is_valid_invisible_list (list_node)) + if (list_node == NULL || + !is_valid_invisible_list (list_node)) { g_free (priv->invisible_list_name); priv->invisible_list_name = g_strdup ("invisible-gabble"); |