/pidgin/main: 97ea8574aeea: Fix win32 build

[Tomasz Wasilczyk]

Changeset: 97ea8574aeea190785a4462e477dc506ea47d83e
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-06-12 21:43 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/97ea8574aeea

Description:

Fix win32 build

diffstat:

 pidgin/win32/gtkwin32dep.c |  11 +++++------
 pidgin/win32/gtkwin32dep.h |   2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (44 lines):

diff --git a/pidgin/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
--- a/pidgin/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
@@ -340,14 +340,10 @@ winpidgin_window_flash(GtkWindow *window
 }
 
 void
-winpidgin_conv_blink(PurpleConversation *conv, PurpleMessageFlags flags) {
+winpidgin_conv_blink(PurpleConversation *conv) {
 	PidginConvWindow *win;
 	GtkWindow *window;
 
-	/* Don't flash for our own messages or system messages */
-	if(flags & PURPLE_MESSAGE_SEND || flags & PURPLE_MESSAGE_SYSTEM)
-		return;
-
 	if(conv == NULL) {
 		purple_debug_info("winpidgin", "No conversation found to blink.\n");
 		return;
@@ -379,8 +375,11 @@ winpidgin_conv_blink(PurpleConversation 
 static gboolean
 winpidgin_conv_im_blink(PurpleConversation *conv, PurpleMessage *pmsg)
 {
+	/* Don't flash for our own messages or system messages */
+	if (purple_message_get_flags(pmsg) & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_SYSTEM))
+		return FALSE;
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/win32/blink_im"))
-		winpidgin_conv_blink(conv, flags);
+		winpidgin_conv_blink(conv);
 	return FALSE;
 }
 
diff --git a/pidgin/win32/gtkwin32dep.h b/pidgin/win32/gtkwin32dep.h
--- a/pidgin/win32/gtkwin32dep.h
+++ b/pidgin/win32/gtkwin32dep.h
@@ -41,7 +41,7 @@ int winpidgin_gz_untar(const char* filen
 void winpidgin_notify_uri(const char *uri);
 void winpidgin_shell_execute(const char *target, const char *verb, const char *clazz);
 void winpidgin_ensure_onscreen(GtkWidget *win);
-void winpidgin_conv_blink(PurpleConversation *conv, PurpleMessageFlags flags);
+void winpidgin_conv_blink(PurpleConversation *conv);
 void winpidgin_window_flash(GtkWindow *window, gboolean flash);
 DWORD winpidgin_get_lastactive(void);