aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Barisione <marco.barisione@collabora.co.uk>2013-07-18 22:09:35 +0800
committerMarco Barisione <marco.barisione@collabora.co.uk>2013-07-18 22:17:12 +0800
commit07c3b37828c4ecb649e439859254916a87b36707 (patch)
treed64e6539bfc6445ed0905b57d992338cf95fc2bc
parenta073a5676a16dde521676f9701d51929d811d4a9 (diff)
downloadgsoc2013-empathy-07c3b37828c4ecb649e439859254916a87b36707.tar
gsoc2013-empathy-07c3b37828c4ecb649e439859254916a87b36707.tar.gz
gsoc2013-empathy-07c3b37828c4ecb649e439859254916a87b36707.tar.bz2
gsoc2013-empathy-07c3b37828c4ecb649e439859254916a87b36707.tar.lz
gsoc2013-empathy-07c3b37828c4ecb649e439859254916a87b36707.tar.xz
gsoc2013-empathy-07c3b37828c4ecb649e439859254916a87b36707.tar.zst
gsoc2013-empathy-07c3b37828c4ecb649e439859254916a87b36707.zip
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 dc9e036ee..74949852d 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -194,6 +194,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");
@@ -289,6 +292,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);