[next] telepathy-mission-control: mcd_account_self_contact_upgraded_cb: don 't crash on bad timing

[Simon McVittie]

Module: telepathy-mission-control
Branch: next
Commit: 3dcc0f4ebb90b80c8ee39794a65e906013d692a5
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=3dcc0f4ebb90b80c8ee39794a65e906013d692a5

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Sep 18 19:23:52 2013 +0100

mcd_account_self_contact_upgraded_cb: don't crash on bad timing

If the account is disconnecting, we might get the callback for
upgrading after we've already NULLed out self->priv->self_contact.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69542
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 src/mcd-account.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 52bad97..fb03638 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -4925,6 +4925,11 @@ mcd_account_self_contact_upgraded_cb (GObject *source_object,
               tp_contact_get_presence_message (self_contact),
               self_contact);
         }
+      else if (self->priv->self_contact == NULL)
+        {
+          DEBUG ("self-contact '%s' has disappeared since we asked to "
+              "upgrade it", tp_contact_get_identifier (self_contact));
+        }
       else
         {
           DEBUG ("self-contact '%s' has changed to '%s' since we asked to "