diff options
author | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-06-28 12:29:31 +0800 |
---|---|---|
committer | Jonny Lamb <jonnylamb@gnome.org> | 2011-08-22 17:36:33 +0800 |
commit | 2e4efa578faaebb0ef45606080d3586e8e2e739f (patch) | |
tree | be6a4f3ca052b9a803febc551956393b4c32248d /libempathy-gtk/empathy-individual-view.c | |
parent | d1d3a49fc919ed734b77a6e94afb2d49109182f2 (diff) | |
download | gsoc2013-empathy-2e4efa578faaebb0ef45606080d3586e8e2e739f.tar gsoc2013-empathy-2e4efa578faaebb0ef45606080d3586e8e2e739f.tar.gz gsoc2013-empathy-2e4efa578faaebb0ef45606080d3586e8e2e739f.tar.bz2 gsoc2013-empathy-2e4efa578faaebb0ef45606080d3586e8e2e739f.tar.lz gsoc2013-empathy-2e4efa578faaebb0ef45606080d3586e8e2e739f.tar.xz gsoc2013-empathy-2e4efa578faaebb0ef45606080d3586e8e2e739f.tar.zst gsoc2013-empathy-2e4efa578faaebb0ef45606080d3586e8e2e739f.zip |
Don't assume that all FolksIndividuals have a corresponding EmpathyContact.
Closes: bgo#653599 - Empathy shouldn't assume all TpfPersonas contain a
valid TpContact
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'libempathy-gtk/empathy-individual-view.c')
-rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index db63f0c0d..9d23027fc 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -692,7 +692,8 @@ individual_view_drag_motion (GtkWidget *widget, EmpathyContact *contact = NULL; contact = empathy_contact_dup_from_folks_individual (individual); - caps = empathy_contact_get_capabilities (contact); + if (contact != NULL) + caps = empathy_contact_get_capabilities (contact); tp_clear_object (&contact); } |