diff options
author | Paul Aurich <darkrain42@pidgin.im> | 2009-07-18 05:08:25 +0000 |
---|---|---|
committer | Paul Aurich <darkrain42@pidgin.im> | 2009-07-18 05:08:25 +0000 |
commit | 31ab9d92b934b285c5a0bbf2714fbf8c338a32d1 (patch) | |
tree | 010d462df2f2c9a6980b8cb077d049f8699a17db | |
parent | 1404d575479c656763950875c3ddbb11ca5cdcb6 (diff) | |
download | pidgin-31ab9d92b934b285c5a0bbf2714fbf8c338a32d1.tar.gz |
Fix a crash with the Message Notification plugin and the 'hidden' gtkconv
So I was finally able to reproduce this. "Close IMs immediately" was
disabled and in the Message Notification plugin's settings, everything
is disabled except "[Notify for ]IM windows" and
"Present conversation window".
In my testing, this did not prevent the conversation from re-attaching
when a new message comes on. Fixes #8911.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | pidgin/plugins/notify.c | 3 |
2 files changed, 5 insertions, 0 deletions
@@ -156,6 +156,8 @@ version 2.6.0 (??/??/2009): (Kosta Arvanitis) * When file transfers are complete, the received file name written to the conversation window is now linked to the file. + * Fix a crash when closing a conversation tab that has unread messages + when the Message Notification plugin is loaded. Finch: * The hardware cursor is updated correctly. This will be useful diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c index 1fb867b914..42435fce81 100644 --- a/pidgin/plugins/notify.c +++ b/pidgin/plugins/notify.c @@ -572,6 +572,9 @@ handle_raise(PidginWindow *purplewin) static void handle_present(PurpleConversation *conv) { + if (pidgin_conv_is_hidden(PIDGIN_CONVERSATION(conv))) + return; + purple_conversation_present(conv); } |