summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--pidgin/plugins/notify.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 697069a94a..f00522ec74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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);
}