Merge lp:~smspillaz/gnome-keyring/gnome-keyring.fix_931958 into lp:~ubuntu-desktop/gnome-keyring/ubuntu

[Sam Spilsbury]

Don't re-grab the keyboard if the window state changed if we didn't ungrab the window for the same reason. Fixes LP #931958

[Sebastien Bacher (seb128)]

Thanks, Sam, that code has been moved upstream in gcr but still seem identic:
http://git.gnome.org/browse/gcr/log/gcr/gcr-prompt-dialog.c

Do you think you could open a bug https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-keyring (component gcr) with your patch and the rational?

[Sebastien Bacher (seb128)]

I've forwarded the patch to https://bugzilla.gnome.org/show_bug.cgi?id=673517

[Michael Terry (mterry)]

Not sure why this didn't get pushed in? Looks good to me, so I uploaded it.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-26 19:00:17 +0000
+++ debian/changelog	2012-04-03 07:51:18 +0000
@@ -1,3 +1,11 @@
+gnome-keyring (3.2.2-2ubuntu3) precise; urgency=low
+
+  * debian/patches/05_grab_tracking.patch: track when we ungrabbed the keyboard
+    because the window state changed so that we only re-grab it when
+    we had initially ungrabbed it for this reason. (LP #931958)
+
+ -- Sam Spilsbury <[e-mail]>  Tue, 03 Apr 2012 15:46:24 +0800
+
 gnome-keyring (3.2.2-2ubuntu2) precise; urgency=low
 
   * ubiquity-hook: Call 'logger' instead of 'echo' so that the error is

=== added file 'debian/patches/05_grab_tracking.patch'
--- debian/patches/05_grab_tracking.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05_grab_tracking.patch	2012-04-03 07:51:18 +0000
@@ -0,0 +1,29 @@
+Index: gnome-keyring-3.2.2/ui/gku-prompt-tool.c
+===================================================================
+--- gnome-keyring-3.2.2.orig/ui/gku-prompt-tool.c	2011-11-14 18:27:43.000000000 +0800
++++ gnome-keyring-3.2.2/ui/gku-prompt-tool.c	2012-04-03 15:45:40.338888289 +0800
+@@ -201,9 +201,15 @@
+ 	    state & GDK_WINDOW_STATE_ICONIFIED ||
+ 	    state & GDK_WINDOW_STATE_FULLSCREEN ||
+ 	    state & GDK_WINDOW_STATE_MAXIMIZED)
++	{
++		g_object_set_data (G_OBJECT (win), "grab-disabled", GINT_TO_POINTER (1));
+ 		ungrab_keyboard (win, (GdkEvent*)event, data);
+-	else
++	}
++	else if (g_object_get_data (G_OBJECT (win), "grab-disabled") == GPOINTER_TO_INT (1))
++	{
++		g_object_set_data (G_OBJECT (win), "grab-disabled", GINT_TO_POINTER (0));
+ 		grab_keyboard (win, (GdkEvent*)event, data);
++	}
+ 
+ 	return FALSE;
+ }
+@@ -465,6 +471,7 @@
+ 	 * When passwords are involved we grab the keyboard so that people
+ 	 * don't accidentally type their passwords in other windows.
+ 	 */
++	g_object_set_data (G_OBJECT (dialog), "grab-disabled", GINT_TO_POINTER (0));
+ 	g_signal_connect (dialog, "map-event", G_CALLBACK (grab_keyboard), NULL);
+ 	g_signal_connect (dialog, "unmap-event", G_CALLBACK (ungrab_keyboard), NULL);
+ 	g_signal_connect (dialog, "window-state-event", G_CALLBACK (window_state_changed), NULL);

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-01 14:32:13 +0000
+++ debian/patches/series	2012-04-03 07:51:18 +0000
@@ -3,3 +3,4 @@
 00git_rpc-layer-Correctly-handle-case-where-gnome-keyring-.patch
 03_kfreebsd.patch
 04_nodisplay_autostart.patch
+05_grab_tracking.patch