--- a/ChangeLog	Fri Sep 19 11:57:01 2008 +0000
+++ b/ChangeLog	Fri Sep 19 13:00:28 2008 +0000
@@ -1,3 +1,7 @@
+2008-09-19  simon.zheng  <[email protected]>
+
+	* patches/gnome-power-manager-07-screensaver.diff: Fix bugster #6747804
+
 2008-09-19  Ginn Chen <[email protected]>
 	* base-specs/firefox.spec:
 	* patches/firefox3-23-spellchecker-default.diff:

--- a/patches/gnome-power-manager-07-screensaver.diff	Fri Sep 19 11:57:01 2008 +0000
+++ b/patches/gnome-power-manager-07-screensaver.diff	Fri Sep 19 13:00:28 2008 +0000
@@ -97,14 +97,14 @@
 +				NULL,
 +				NULL,
 +				GDK_CURRENT_TIME) 
-+				== GDK_GRAB_SUCCESS) {
-+			if (gdk_keyboard_grab (invisible->window, FALSE, GDK_CURRENT_TIME)
-+		  				== GDK_GRAB_SUCCESS)
-+				break;
-+			else
-+				gdk_pointer_ungrab (GDK_CURRENT_TIME);
++				== GDK_GRAB_ALREADY_GRABBED 
++		   && gdk_keyboard_grab (invisible->window, FALSE, GDK_CURRENT_TIME)
++		  		== GDK_GRAB_ALREADY_GRABBED)
++			break;
++		else {
++			gdk_pointer_ungrab (GDK_CURRENT_TIME);
++			gdk_keyboard_ungrab (GDK_CURRENT_TIME);
 +		}
-+
 +		g_usleep (1000 * 100);
 +	} 
 +	gtk_widget_destroy (invisible);