aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-04-15 23:19:56 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-04-15 23:19:56 +0800
commit12687af8e7e87e5c31a15df4b686ac89b58941e3 (patch)
tree551699264ed883c25affb3a1f25994ed18b7c5e2
parente90abd7be91524f1692054920692c83b47662b07 (diff)
downloadgsoc2013-empathy-12687af8e7e87e5c31a15df4b686ac89b58941e3.tar
gsoc2013-empathy-12687af8e7e87e5c31a15df4b686ac89b58941e3.tar.gz
gsoc2013-empathy-12687af8e7e87e5c31a15df4b686ac89b58941e3.tar.bz2
gsoc2013-empathy-12687af8e7e87e5c31a15df4b686ac89b58941e3.tar.lz
gsoc2013-empathy-12687af8e7e87e5c31a15df4b686ac89b58941e3.tar.xz
gsoc2013-empathy-12687af8e7e87e5c31a15df4b686ac89b58941e3.tar.zst
gsoc2013-empathy-12687af8e7e87e5c31a15df4b686ac89b58941e3.zip
protocol-chooser: return NULL if for some reason we can't find the procol any more
This could eventually happen if a CM claims to support a protocol in its manager file but actually don't. Should fix #61582
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 72eb05536..9f57d921a 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -497,6 +497,14 @@ empathy_protocol_chooser_dup_selected (
tp_connection_manager_get_protocol (cm, protocol_name);
g_free (protocol_name);
+
+ if (*protocol == NULL)
+ {
+ /* For some reason the CM doesn't know about this protocol
+ * any more */
+ g_object_unref (cm);
+ return NULL;
+ }
}
if (is_gtalk != NULL)