summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Barisione <marco.barisione@collabora.co.uk>2013-07-18 15:09:35 +0100
committerMarco Barisione <marco.barisione@collabora.co.uk>2013-07-18 15:37:18 +0100
commit1fc5a6fccf25ed44d39837125916f5282bf80abb (patch)
treee7e94afa30b5dac425f6c470e16ff4a9feeda9df
parent76a11c06dae40c16d70c506b808bec51d5a1cd13 (diff)
GOA: ignore non-Telepathy accounts
This fixes a crash when trying to remove a GOA account without chat support. https://bugzilla.gnome.org/show_bug.cgi?id=704469
-rw-r--r--goa-mc-plugin/mcp-account-manager-goa.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 41eb8f6e..5072b161 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -197,6 +197,9 @@ object_chat_changed_cb (GoaObject *object,
char *name = get_tp_account_name (account);
gboolean enabled;
+ if (name == NULL)
+ return;
+
enabled = (goa_object_peek_chat (object) != NULL);
DEBUG ("%s %s", name, enabled ? "enabled" : "disabled");
@@ -292,6 +295,9 @@ _account_removed_cb (GoaClient *client,
GoaAccount *account = goa_object_peek_account (object);
char *name = get_tp_account_name (account);
+ if (name == NULL)
+ return;
+
if (self->priv->ready)
g_signal_emit_by_name (self, "deleted", name);