gnome-keyring r1332 - in trunk: . daemon/ui

[nnielsen svn gnome org]

Author: nnielsen
Date: Mon Sep 15 15:10:47 2008
New Revision: 1332
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1332&view=rev

Log:
	* daemon/ui/gkr-ask-tool.c: Fix for keyboard ungrabbing when
	minimizing the password prompt window, and handle grab
	errors in a better manner.


Modified:
   trunk/ChangeLog
   trunk/daemon/ui/gkr-ask-tool.c

Modified: trunk/daemon/ui/gkr-ask-tool.c
==============================================================================
--- trunk/daemon/ui/gkr-ask-tool.c	(original)
+++ trunk/daemon/ui/gkr-ask-tool.c	Mon Sep 15 15:10:47 2008
@@ -327,17 +327,21 @@
 static gboolean
 grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
 {
-	if (!grabbed)
-		if (gdk_keyboard_grab (win->window, FALSE, gdk_event_get_time (event)))
-			g_message ("could not grab keyboard");
-	grabbed = TRUE;
+	GdkGrabStatus status;
+	if (!grabbed) {
+		status = gdk_keyboard_grab (win->window, FALSE, gdk_event_get_time (event));
+		if (status == GDK_GRAB_SUCCESS)
+			grabbed = TRUE;
+		else
+			g_message ("could not grab keyboard: %d", (int)status);
+	}
 	return FALSE;
 }
 
 static gboolean
 ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
 {
-	if (!grabbed)
+	if (grabbed)
 		gdk_keyboard_ungrab (gdk_event_get_time (event));
 	grabbed = FALSE;
 	return FALSE;