File policykit-gnome-bnc384159-bgo531609-no-grabs.diff of Package PolicyKit-gnome

Overview Repositories Revisions Requests Users Attributes Meta

File policykit-gnome-bnc384159-bgo531609-no-grabs.diff of Package PolicyKit-gnome (Revision d070826ab21a047e013e1ebda9127771)

Currently displaying revision d070826ab21a047e013e1ebda9127771 , Show latest

https://bugzilla.novell.com/show_bug.cgi?id=384159

PolicyKit-gnome's authentication dialog should not grab the mouse/keyboard.

From 86e0a42f603828da7fc8eb87cf4547190b90d42b Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@gnu.org>
Date: Thu, 8 May 2008 19:31:46 -0500
Subject: [PATCH] bgo531609 - Don't grab the pointer when popping up the auth dialog

Signed-off-by: Federico Mena Quintero <federico@gnu.org>
---
 src/polkit-gnome-manager.c |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/polkit-gnome-manager.c b/src/polkit-gnome-manager.c
index 03b90b1..b31f1f6 100644
--- a/src/polkit-gnome-manager.c
+++ b/src/polkit-gnome-manager.c
@@ -573,24 +573,14 @@ _do_grab (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
         GdkGrabStatus ret;
 
-        ret = gdk_pointer_grab (widget->window, 
-                                TRUE,
-                                GDK_POINTER_MOTION_MASK|GDK_BUTTON_MOTION_MASK,
-                                NULL,
-                                NULL,
-                                GDK_CURRENT_TIME);
-        if (ret != GDK_GRAB_SUCCESS) {
-                g_warning ("Couldn't grab the pointer; ret = %d", ret);
-        }
-
         ret = gdk_keyboard_grab (widget->window, 
                                 FALSE,
                                 GDK_CURRENT_TIME);
         if (ret != GDK_GRAB_SUCCESS) {
-                g_warning ("Couldn't grab the pointer; ret = %d", ret);
+                g_warning ("Couldn't grab the keyboard; ret = %d", ret);
         }
 
-        g_debug ("Grabbed pointer and keyboard");
+        g_debug ("Grabbed keyboard");
 }
 
 /*--------------------------------------------------------------------------------------------------------------*/
@@ -1083,8 +1073,7 @@ error:
 
         /* Ungrab keyboard and pointer */
         gdk_keyboard_ungrab (GDK_CURRENT_TIME);
-        gdk_pointer_ungrab (GDK_CURRENT_TIME);
-        g_debug ("Ungrabbed pointer and keyboard");
+        g_debug ("Ungrabbed keyboard");
 
         if (ud->dialog != NULL) {
                 gtk_widget_destroy (ud->dialog);
-- 
1.5.4.5

From 01963459038ca4eb4e11956c8b1b23813f8f96e5 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@gnu.org>
Date: Thu, 8 May 2008 19:36:28 -0500
Subject: [PATCH] Ungrab the keyboard only if we were able to grab it

Signed-off-by: Federico Mena Quintero <federico@gnu.org>
---
 src/polkit-gnome-manager.c |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/polkit-gnome-manager.c b/src/polkit-gnome-manager.c
index b31f1f6..40b679e 100644
--- a/src/polkit-gnome-manager.c
+++ b/src/polkit-gnome-manager.c
@@ -516,6 +516,8 @@ typedef struct {
         char **admin_users;
 
         char *admin_user_selected;
+
+        gboolean got_keyboard_grab;
 } UserData;
 
 static void
@@ -572,15 +574,19 @@ static void
 _do_grab (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
         GdkGrabStatus ret;
+        UserData *ud = user_data;
+
+        ud->got_keyboard_grab = FALSE;
 
         ret = gdk_keyboard_grab (widget->window, 
-                                FALSE,
-                                GDK_CURRENT_TIME);
+                                 FALSE,
+                                 GDK_CURRENT_TIME); /* FIXME: ideally we need a real timestamp */
         if (ret != GDK_GRAB_SUCCESS) {
                 g_warning ("Couldn't grab the keyboard; ret = %d", ret);
+        } else {
+                g_debug ("Grabbed keyboard");
+                ud->got_keyboard_grab = TRUE;
         }
-
-        g_debug ("Grabbed keyboard");
 }
 
 /*--------------------------------------------------------------------------------------------------------------*/
@@ -1072,8 +1078,10 @@ try_again:
 error:
 
         /* Ungrab keyboard and pointer */
-        gdk_keyboard_ungrab (GDK_CURRENT_TIME);
-        g_debug ("Ungrabbed keyboard");
+        if (ud->got_keyboard_grab) {
+                gdk_keyboard_ungrab (GDK_CURRENT_TIME);
+                g_debug ("Ungrabbed keyboard");
+        }
 
         if (ud->dialog != NULL) {
                 gtk_widget_destroy (ud->dialog);
-- 
1.5.4.5

From 999e06dcc9f7e9259799c1f565f9b8fa478c9db5 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@gnu.org>
Date: Fri, 9 May 2008 13:08:49 -0500
Subject: [PATCH] bgo531609 - Grab the keyboard only if a GConf key is set

Signed-off-by: Federico Mena Quintero <federico@gnu.org>
---
 src/polkit-gnome-manager.c |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/polkit-gnome-manager.c b/src/polkit-gnome-manager.c
index 40b679e..e6626ec 100644
--- a/src/polkit-gnome-manager.c
+++ b/src/polkit-gnome-manager.c
@@ -33,6 +33,7 @@
 #include <glib/gi18n-lib.h>
 #include <glib-object.h>
 #include <gdk/gdkx.h>
+#include <gconf/gconf-client.h>
 
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus-glib.h>
@@ -47,6 +48,8 @@
 
 #include "polkit-gnome-auth-dialog.h"
 
+#define KEY_AUTH_DIALOG_GRAB_KEYBOARD "/desktop/gnome/policykit/auth_dialog_grab_keyboard"
+
 static void do_cancel_auth (void);
 
 
@@ -573,19 +576,24 @@ conversation_type (PolKitGrant *polkit_grant, PolKitResult auth_type, void *user
 static void
 _do_grab (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
-        GdkGrabStatus ret;
         UserData *ud = user_data;
+        GConfClient *client;
 
         ud->got_keyboard_grab = FALSE;
 
-        ret = gdk_keyboard_grab (widget->window, 
-                                 FALSE,
-                                 GDK_CURRENT_TIME); /* FIXME: ideally we need a real timestamp */
-        if (ret != GDK_GRAB_SUCCESS) {
-                g_warning ("Couldn't grab the keyboard; ret = %d", ret);
-        } else {
-                g_debug ("Grabbed keyboard");
-                ud->got_keyboard_grab = TRUE;
+        client = gconf_client_get_default ();
+        if (gconf_client_get_bool (client, KEY_AUTH_DIALOG_GRAB_KEYBOARD, NULL)) { /* NULL-GError */
+                GdkGrabStatus ret;
+
+                ret = gdk_keyboard_grab (widget->window, 
+                                         FALSE,
+                                         GDK_CURRENT_TIME); /* FIXME: ideally we need a real timestamp */
+                if (ret != GDK_GRAB_SUCCESS) {
+                        g_warning ("Couldn't grab the keyboard; ret = %d", ret);
+                } else {
+                        g_debug ("Grabbed keyboard");
+                        ud->got_keyboard_grab = TRUE;
+                }
         }
 }
 
-- 
1.5.4.5

From 0173c444ce3df88bfbbbb2c6fdef94ebc3eccdb6 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@gnu.org>
Date: Fri, 9 May 2008 14:42:48 -0500
Subject: [PATCH] Add gconf schema file

Signed-off-by: Federico Mena Quintero <federico@gnu.org>
---
 configure.ac                 |   12 ++++++++++++
 data/Makefile.am             |   23 +++++++++++++++++++++--
 data/polkit-gnome.schemas.in |   22 ++++++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 data/polkit-gnome.schemas.in

diff --git a/configure.ac b/configure.ac
index f8b09d4..ea0c78c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,18 @@ if test "x$enable_examples" = "xyes"; then
     fi
 fi
 
+dnl ==============================================
+dnl Special GConf section 
+dnl ==============================================
+
+AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+
+if test x"$GCONFTOOL" = xno; then
+  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+fi
+
+AM_GCONF_SOURCE_2
+
 # ********************
 # Internationalisation
 # ********************
diff --git a/data/Makefile.am b/data/Makefile.am
index dc9412b..66286cd 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,18 @@
+schema_in_files =  polkit-gnome.schemas.in
+schemadir   = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+
+@INTLTOOL_SCHEMAS_RULE@
+
+# don't do this if we are building in eg. rpm
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+	if test -z "$(DESTDIR)" ; then \
+		for p in $(schema_DATA) ; do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
+		done \
+	fi
+endif
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
@@ -24,7 +39,11 @@ pkgconfig_DATA = polkit-gnome.pc
 
 DISTCLEANFILES = $(service_DATA) $(desktop_DATA) $(pkgconfig_DATA)
 
-EXTRA_DIST = $(service_in_files) $(desktop_in_files) polkit-gnome.pc.in
+EXTRA_DIST =			\
+	$(service_in_files)	\
+	$(desktop_in_files)	\
+	$(schema_in_files)	\
+	polkit-gnome.pc.in
 
 clean-local :
-	rm -f *~ $(service_DATA) $(pkgconfig_DATA)
+	rm -f *~ $(service_DATA) $(pkgconfig_DATA) $(schema_DATA)
diff --git a/data/polkit-gnome.schemas.in b/data/polkit-gnome.schemas.in
new file mode 100644
index 0000000..954b5d0
--- /dev/null
+++ b/data/polkit-gnome.schemas.in
@@ -0,0 +1,22 @@
+<gconfschemafile>
+  <schemalist>
+
+    <schema>
+      <key>/schemas/desktop/gnome/policykit/auth_dialog_grab_keyboard</key>
+      <applyto>/desktop/gnome/policykit/auth_dialog_grab_keyboard</applyto>
+      <owner>policykit-gnome</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Whether the authentication dialog should grab the keyboard</short>
+         <long>
+          If set to true, the authentication dialog from PolicyKit-gnome will grab the keyboard,
+          so that you will not be able to type in other programs while the dialog is active.
+	  Use this if your window manager does not focus the authentication dialog automatically,
+	  and you want to avoid accidentally typing passwords in other programs.
+         </long>
+      </locale>
+    </schema>
+
+  </schemalist>
+</gconfschemafile>
-- 
1.5.4.5

Places

File policykit-gnome-bnc384159-bgo531609-no-grabs.diff of Package PolicyKit-gnome (Revision d070826ab21a047e013e1ebda9127771)

Places