[Gaim-commits] SF.net SVN: gaim: [17560] trunk/gtk/win32/gtkwin32dep.c

[<dat...@us...>]

Revision: 17560
          http://svn.sourceforge.net/gaim/?rev=17560&view=rev
Author:   datallah
Date:     2006-10-21 16:36:44 -0700 (Sat, 21 Oct 2006)

Log Message:
-----------
Use Windows' built-in functionality to stop flashing.

Modified Paths:
--------------
    trunk/gtk/win32/gtkwin32dep.c

Modified: trunk/gtk/win32/gtkwin32dep.c
===================================================================
--- trunk/gtk/win32/gtkwin32dep.c	2006-10-21 21:19:02 UTC (rev 17559)
+++ trunk/gtk/win32/gtkwin32dep.c	2006-10-21 23:36:44 UTC (rev 17560)
@@ -225,25 +225,6 @@
 	return win_hwnd;
 }
 
-static int
-halt_flash_filter(GtkWidget *widget, GdkEventFocus *event, gpointer data) {
-	if(MyFlashWindowEx) {
-		HWND hWnd = data;
-		FLASHWINFO info;
-
-		if(!IsWindow(hWnd))
-			return 0;
-
-		memset(&info, 0, sizeof(FLASHWINFO));
-		info.cbSize = sizeof(FLASHWINFO);
-		info.hwnd = hWnd;
-		info.dwFlags = FLASHW_STOP;
-		info.dwTimeout = 0;
-		MyFlashWindowEx(&info);
-	}
-	return 0;
-}
-
 void
 gtkwgaim_conv_blink(GaimConversation *conv, GaimMessageFlags flags) {
 	GaimGtkWindow *win;
@@ -266,21 +247,19 @@
 
 	window = win->window;
 
+	/* Don't flash if we have the window focused */
+	if(GetForegroundWindow() == GDK_WINDOW_HWND(window->window))
+		return;
+
 	if(MyFlashWindowEx) {
 		FLASHWINFO info;
-		/* Don't flash if we have the window focused */
-		if(GetForegroundWindow() == GDK_WINDOW_HWND(window->window))
-			return;
 
 		memset(&info, 0, sizeof(FLASHWINFO));
 		info.cbSize = sizeof(FLASHWINFO);
 		info.hwnd = GDK_WINDOW_HWND(window->window);
-		info.dwFlags = FLASHW_ALL | FLASHW_TIMER;
+		info.dwFlags = FLASHW_ALL | FLASHW_TIMERNOFG;
 		info.dwTimeout = 0;
 		MyFlashWindowEx(&info);
-		/* Stop flashing when window receives focus */
-		g_signal_connect(G_OBJECT(window), "focus-in-event",
-			G_CALLBACK(halt_flash_filter), info.hwnd);
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.