Mercurial > pidgin.yaz
changeset 29210:0b48f58e8c50
Don't try to remove a timeout on a NULL conversation, which can happen when
the received-im-msg signal is called for a message-that-starts-a-conv. This
fixes a small ("fatal") g_log thing.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Thu, 31 Dec 2009 00:33:12 +0000 |
| parents | ac6c2dda0eae |
| children | 091797665df5 |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Wed Dec 23 07:47:14 2009 +0000 +++ b/pidgin/gtkconv.c Thu Dec 31 00:33:12 2009 +0000 @@ -5493,10 +5493,12 @@ } /* Somebody wants to keep this conversation around, so don't time it out */ - timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer")); - if (timer) { - purple_timeout_remove(timer); - purple_conversation_set_data(conv, "close-timer", GINT_TO_POINTER(0)); + if (conv) { + timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer")); + if (timer) { + purple_timeout_remove(timer); + purple_conversation_set_data(conv, "close-timer", GINT_TO_POINTER(0)); + } } }