diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-12-09 17:54:26 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-12-14 17:52:33 +0800 |
| commit | 844b932834beb6f15d454d14662ca7719bb28981 (patch) | |
| tree | b852e2185fa342d35584724bd6d6cf81be6ffdd7 /libempathy-gtk | |
| parent | eebfb2b90332782fc3ff79386e9a4808d277337b (diff) | |
| download | gsoc2013-empathy-844b932834beb6f15d454d14662ca7719bb28981.tar gsoc2013-empathy-844b932834beb6f15d454d14662ca7719bb28981.tar.gz gsoc2013-empathy-844b932834beb6f15d454d14662ca7719bb28981.tar.bz2 gsoc2013-empathy-844b932834beb6f15d454d14662ca7719bb28981.tar.lz gsoc2013-empathy-844b932834beb6f15d454d14662ca7719bb28981.tar.xz gsoc2013-empathy-844b932834beb6f15d454d14662ca7719bb28981.tar.zst gsoc2013-empathy-844b932834beb6f15d454d14662ca7719bb28981.zip | |
Deal with empathy_create_individual_from_tp_contact() returning NULL
Shouldn't really happen in practice but better to be safe than sorry.
https://bugzilla.gnome.org/show_bug.cgi?id=665853
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-contact-chooser.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-store-channel.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c index cba419bea..97ce7d9d7 100644 --- a/libempathy-gtk/empathy-contact-chooser.c +++ b/libempathy-gtk/empathy-contact-chooser.c @@ -221,6 +221,8 @@ get_contacts_cb (TpConnection *connection, return; individual = empathy_create_individual_from_tp_contact (contacts[0]); + if (individual == NULL) + return; /* listen for updates to the capabilities */ tp_g_signal_connect_object (contacts[0], "notify::capabilities", diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c index 75284602b..76ff74e25 100644 --- a/libempathy-gtk/empathy-individual-store-channel.c +++ b/libempathy-gtk/empathy-individual-store-channel.c @@ -82,6 +82,8 @@ add_members (EmpathyIndividualStoreChannel *self, continue; individual = empathy_create_individual_from_tp_contact (contact); + if (individual == NULL) + return; DEBUG ("%s joined channel %s", tp_contact_get_identifier (contact), tp_proxy_get_object_path (self->priv->channel)); |