r36618 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/06_a11y_gdm_leak.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Feb  5 15:35:02 2013
New Revision: 36618

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36618
Log:
06_a11y_gdm_leak.patch: backported from git master. Reset keyboard
accessibility settings when shutting down the settings daemon. This 
avoids leaking them from the GDM session to the user’s.
Closes: #682581.

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_gdm_leak.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=36618&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Tue Feb  5 15:35:02 2013
@@ -1,3 +1,12 @@
+gnome-settings-daemon (3.4.2+git20121218.7c1322-3) unstable; urgency=low
+
+  * 06_a11y_gdm_leak.patch: backported from git master. Reset keyboard
+    accessibility settings when shutting down the settings daemon. This 
+    avoids leaking them from the GDM session to the user’s.
+    Closes: #682581.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 05 Feb 2013 16:34:56 +0100
+
 gnome-settings-daemon (3.4.2+git20121218.7c1322-2) unstable; urgency=low
 
   * 05_sound_pkg-config.patch: backported from 3.6. Correctly link the 

Added: desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_gdm_leak.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_gdm_leak.patch?rev=36618&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_gdm_leak.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_gdm_leak.patch [utf-8] Tue Feb  5 15:35:02 2013
@@ -1,0 +1,70 @@
+From ae36405207ba5ef0a0c7ea6b154e80d8be3e675c Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 28 Jan 2013 16:59:21 +0000
+Subject: a11y-keyboard: Disable everything on exit if no settings changed
+
+The default setting in GDM is to have the keys enablable
+through keyboard shortcuts, and this gets inherited by the
+user sessions.
+
+The problem is that non-GNOME users won't have anything
+changing those defaults back to their expected values
+(so that Slow Keys don't triggered for example), and this
+causes problems:
+https://bugzilla.redhat.com/show_bug.cgi?id=816764
+
+If the user doesn't change anything to the defaults in the GDM
+session, we revert to the pre-"GNOME session" values.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=685063
+---
+Index: gnome-settings-daemon-3.4.2+git20121218.7c1322/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+===================================================================
+--- gnome-settings-daemon-3.4.2+git20121218.7c1322.orig/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	2013-02-05 16:32:31.098112464 +0100
++++ gnome-settings-daemon-3.4.2+git20121218.7c1322/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	2013-02-05 16:32:31.090112428 +0100
+@@ -63,6 +63,8 @@ struct GsdA11yKeyboardManagerPrivate
+         GtkWidget        *preferences_dialog;
+         GtkStatusIcon    *status_icon;
+ 
++        XkbDescRec       *desc;
++
+         GSettings        *settings;
+ 
+         NotifyNotification *notification;
+@@ -947,6 +949,9 @@ start_a11y_keyboard_idle_cb (GsdA11yKeyb
+ 
+         set_devicepresence_handler (manager);
+ 
++        /* Get the original configuration from the server */
++        manager->priv->desc = get_xkb_desc_rec (manager);
++
+         event_mask = XkbControlsNotifyMask;
+         event_mask |= XkbAccessXNotifyMask; /* make default when AXN_AXKWarning works */
+ 
+@@ -992,6 +997,26 @@ gsd_a11y_keyboard_manager_stop (GsdA11yK
+ 
+         g_debug ("Stopping a11y_keyboard manager");
+ 
++        if (p->desc != NULL) {
++                XkbDescRec *desc;
++
++                desc = get_xkb_desc_rec (manager);
++                if (desc != NULL) {
++                        if (p->desc->ctrls->enabled_ctrls != desc->ctrls->enabled_ctrls) {
++                                gdk_error_trap_push ();
++                                XkbSetControls (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
++                                                DEFAULT_XKB_SET_CONTROLS_MASK,
++                                                p->desc);
++
++                                XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
++                                gdk_error_trap_pop_ignored ();
++                        }
++                        XkbFreeKeyboard (desc, XkbAllComponentsMask, True);
++                }
++                XkbFreeKeyboard (p->desc, XkbAllComponentsMask, True);
++                p->desc = NULL;
++        }
++
+         if (p->start_idle_id != 0) {
+                 g_source_remove (p->start_idle_id);
+                 p->start_idle_id = 0;

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=36618&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Tue Feb  5 15:35:02 2013
@@ -3,6 +3,7 @@
 03_print_async.patch
 04_superP.patch
 05_sound_pkg-config.patch
+06_a11y_gdm_leak.patch
 10_smaller_syndaemon_timeout.patch
 power-check-null-devices.patch
 power-ignore-bad-dbus-requests.patch