[Gaim-commits] CVS: gaim/src/win32/IdleTracker idletrack.c,1.4,1.5

[Herman B. <her...@us...>]

Update of /cvsroot/gaim/gaim/src/win32/IdleTracker
In directory sc8-pr-cvs1:/tmp/cvs-serv25735

Modified Files:
	idletrack.c 
Log Message:
Fix for bug #792641 - Windows hooks tie up

Index: idletrack.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/IdleTracker/idletrack.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- idletrack.c	19 Aug 2003 16:07:09 -0000	1.4
+++ idletrack.c	21 Aug 2003 18:29:48 -0000	1.5
@@ -59,36 +59,31 @@
 
 
 LRESULT CALLBACK KeyboardProc(int code, WPARAM wParam, LPARAM lParam) {
-	if (code < 0)
-		return CallNextHookEx(keyHook, code, wParam, lParam);
-	if (lastTime == NULL)
-		lastTime = setup_shared_mem();
-	
-	if (lastTime)
-		*lastTime = GetTickCount();
+	if (!(code < 0)) {
+                if (lastTime == NULL)
+                        lastTime = setup_shared_mem();
 	
+                if (lastTime)
+                        *lastTime = GetTickCount();
+        }
 	return CallNextHookEx(keyHook, code, wParam, lParam);
 }
 
 
 LRESULT CALLBACK MouseProc(int code, WPARAM wParam, LPARAM lParam) {
-	if (code < 0)
-		return CallNextHookEx(mouseHook, code, wParam, lParam);
-
 	/* We need to verify that the Mouse pointer has actually moved. */
-	if((g_point.x == ((MOUSEHOOKSTRUCT*)lParam)->pt.x) &&
-	   (g_point.y == ((MOUSEHOOKSTRUCT*)lParam)->pt.y))
-		return 0;
-
-	g_point.x = ((MOUSEHOOKSTRUCT*)lParam)->pt.x;
-	g_point.y = ((MOUSEHOOKSTRUCT*)lParam)->pt.y;
-	
-	if (lastTime == NULL)
-		lastTime = setup_shared_mem();
+	if(!(code < 0) && 
+           !((g_point.x == ((MOUSEHOOKSTRUCT*)lParam)->pt.x) &&
+             (g_point.y == ((MOUSEHOOKSTRUCT*)lParam)->pt.y))) {
+                g_point.x = ((MOUSEHOOKSTRUCT*)lParam)->pt.x;
+                g_point.y = ((MOUSEHOOKSTRUCT*)lParam)->pt.y;
 	
-	if (lastTime)
-		*lastTime = GetTickCount();
+                if (lastTime == NULL)
+                        lastTime = setup_shared_mem();
 	
+                if (lastTime)
+                        *lastTime = GetTickCount();
+	}
 	return CallNextHookEx(mouseHook, code, wParam, lParam);
 }