diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-04-15 23:19:56 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-04-15 23:22:22 +0800 |
| commit | 328cdf4c7520b1526b1aac245791f1e97be2d3a5 (patch) | |
| tree | c2a738680d554d8db77979f90517485e6719e380 | |
| parent | b1a7119082e71351bf2fce3a850206fb322f6096 (diff) | |
| download | gsoc2013-empathy-328cdf4c7520b1526b1aac245791f1e97be2d3a5.tar gsoc2013-empathy-328cdf4c7520b1526b1aac245791f1e97be2d3a5.tar.gz gsoc2013-empathy-328cdf4c7520b1526b1aac245791f1e97be2d3a5.tar.bz2 gsoc2013-empathy-328cdf4c7520b1526b1aac245791f1e97be2d3a5.tar.lz gsoc2013-empathy-328cdf4c7520b1526b1aac245791f1e97be2d3a5.tar.xz gsoc2013-empathy-328cdf4c7520b1526b1aac245791f1e97be2d3a5.tar.zst gsoc2013-empathy-328cdf4c7520b1526b1aac245791f1e97be2d3a5.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.c | 8 |
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) |