[Pkg-telepathy-commits] [empathy] 13/39: GOA: ignore non-Telepathy accounts

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository empathy.

commit 1fc5a6fccf25ed44d39837125916f5282bf80abb
Author: Marco Barisione <marco.barisione at collabora.co.uk>
Date:   Thu Jul 18 15:09:35 2013 +0100

    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
---
 goa-mc-plugin/mcp-account-manager-goa.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 41eb8f6..5072b16 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);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git