/soc/2015/mmcc/main: a7b373724f6c: Fix merge issue
Daniel Atallah
datallah at pidgin.im
Tue Jun 23 16:02:34 EDT 2015
Changeset: a7b373724f6c129ebdc0f446f54c582fe45ee92a
Author: Daniel Atallah <datallah at pidgin.im>
Date: 2015-06-18 11:27 -0400
Branch: default
URL: https://hg.pidgin.im/soc/2015/mmcc/main/rev/a7b373724f6c
Description:
Fix merge issue
diffstat:
pidgin/plugins/notify.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (34 lines):
diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c
--- a/pidgin/plugins/notify.c
+++ b/pidgin/plugins/notify.c
@@ -262,11 +262,6 @@ message_displayed_cb(PurpleConversation
{
PurpleMessageFlags flags = purple_message_get_flags(msg);
- if ((PURPLE_IS_CHAT_CONVERSATION(conv) &&
- purple_prefs_get_bool("/plugins/gtk/X11/notify/type_chat_nick") &&
- !(flags & PURPLE_MESSAGE_NICK)))
- return FALSE;
-
/* Ignore anything that's not a received message or a system message */
if (!(flags & (PURPLE_MESSAGE_RECV|PURPLE_MESSAGE_SYSTEM)))
return FALSE;
@@ -281,12 +276,17 @@ message_displayed_cb(PurpleConversation
} else if (PURPLE_IS_IM_CONVERSATION(conv)) {
if (!purple_prefs_get_bool("/plugins/gtk/X11/notify/type_im_sys"))
return FALSE;
- }
} else {
/* System message not from chat or IM, ignore */
return FALSE;
}
}
+
+ /* If it's a chat, check if we should only highlight when nick is mentioned */
+ if ((PURPLE_IS_CHAT_CONVERSATION(conv) &&
+ purple_prefs_get_bool("/plugins/gtk/X11/notify/type_chat_nick") &&
+ !(flags & PURPLE_MESSAGE_NICK)))
+ return FALSE;
/* Nothing speaks against notifying, do so */
notify(conv, TRUE);
More information about the Commits
mailing list