Mercurial > pidgin
changeset 32518:0087049160ad
merge of '081986627877141e126dc3bcd9b0ab5063e96e83'
and 'c1fcac5fd1367b69d817021a3b50df463b53de0b'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 15 Feb 2012 22:27:43 +0000 |
| parents | 5e085a727f4e (diff) de4e6af605a2 (current diff) |
| children | 13d06d60fc49 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/plugins/disco/gtkdisco.c Wed Feb 15 09:47:25 2012 +0000 +++ b/pidgin/plugins/disco/gtkdisco.c Wed Feb 15 22:27:43 2012 +0000 @@ -462,6 +462,8 @@ gtk_tree_model_get_value(GTK_TREE_MODEL(pdl->model), &iter, SERVICE_COLUMN, &val); service = g_value_get_pointer(&val); + if (!service) + return FALSE; switch (service->type) { case XMPP_DISCO_SERVICE_TYPE_UNSET: