r36620 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/06_a11y_gdm_leak.patch patches/06_a11y_macro.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Feb 5 15:39:29 UTC 2013
Author: joss
Date: Tue Feb 5 15:39:29 2013
New Revision: 36620
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36620
Log:
06_a11y_macro.patch: a bit of refactoring that the previous patch
depends on.
Added:
desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_macro.patch
Modified:
desktop/unstable/gnome-settings-daemon/debian/changelog
desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_gdm_leak.patch
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=36620&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:39:29 2013
@@ -4,6 +4,8 @@
accessibility settings when shutting down the settings daemon. This
avoids leaking them from the GDM session to the user’s.
Closes: #682581.
+ + 06_a11y_macro.patch: a bit of refactoring that the previous patch
+ depends on.
-- Josselin Mouette <joss at debian.org> Tue, 05 Feb 2013 16:34:56 +0100
Modified: 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=36620&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_gdm_leak.patch [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_gdm_leak.patch [utf-8] Tue Feb 5 15:39:29 2013
@@ -20,8 +20,8 @@
---
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
+--- gnome-settings-daemon-3.4.2+git20121218.7c1322.orig/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c 2013-02-05 16:38:44.911939950 +0100
++++ gnome-settings-daemon-3.4.2+git20121218.7c1322/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c 2013-02-05 16:38:44.903939914 +0100
@@ -63,6 +63,8 @@ struct GsdA11yKeyboardManagerPrivate
GtkWidget *preferences_dialog;
GtkStatusIcon *status_icon;
@@ -31,7 +31,7 @@
GSettings *settings;
NotifyNotification *notification;
-@@ -947,6 +949,9 @@ start_a11y_keyboard_idle_cb (GsdA11yKeyb
+@@ -950,6 +952,9 @@ start_a11y_keyboard_idle_cb (GsdA11yKeyb
set_devicepresence_handler (manager);
@@ -41,7 +41,7 @@
event_mask = XkbControlsNotifyMask;
event_mask |= XkbAccessXNotifyMask; /* make default when AXN_AXKWarning works */
-@@ -992,6 +997,26 @@ gsd_a11y_keyboard_manager_stop (GsdA11yK
+@@ -995,6 +1000,26 @@ gsd_a11y_keyboard_manager_stop (GsdA11yK
g_debug ("Stopping a11y_keyboard manager");
Added: desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_macro.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_macro.patch?rev=36620&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_macro.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/06_a11y_macro.patch [utf-8] Tue Feb 5 15:39:29 2013
@@ -1,0 +1,48 @@
+From 0bc81bad702d314cfc975ab4df58817a45a6dd05 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 28 Jan 2013 16:58:50 +0000
+Subject: a11y-keyboard: Use macro for everything mask
+
+Less to copy/paste
+---
+diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+index 7acd274..33e4665 100644
+--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
++++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+@@ -62,6 +62,17 @@ struct GsdA11yKeyboardManagerPrivate
+ NotifyNotification *notification;
+ };
+
++#define DEFAULT_XKB_SET_CONTROLS_MASK XkbSlowKeysMask | \
++ XkbBounceKeysMask | \
++ XkbStickyKeysMask | \
++ XkbMouseKeysMask | \
++ XkbMouseKeysAccelMask | \
++ XkbAccessXKeysMask | \
++ XkbAccessXTimeoutMask | \
++ XkbAccessXFeedbackMask | \
++ XkbControlsEnabledMask
++
++
+ static void gsd_a11y_keyboard_manager_class_init (GsdA11yKeyboardManagerClass *klass);
+ static void gsd_a11y_keyboard_manager_init (GsdA11yKeyboardManager *a11y_keyboard_manager);
+ static void gsd_a11y_keyboard_manager_finalize (GObject *object);
+@@ -306,15 +317,7 @@ set_server_from_gsettings (GsdA11yKeyboardManager *manager)
+
+ gdk_error_trap_push ();
+ XkbSetControls (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+- XkbSlowKeysMask |
+- XkbBounceKeysMask |
+- XkbStickyKeysMask |
+- XkbMouseKeysMask |
+- XkbMouseKeysAccelMask |
+- XkbAccessXKeysMask |
+- XkbAccessXTimeoutMask |
+- XkbAccessXFeedbackMask |
+- XkbControlsEnabledMask,
++ DEFAULT_XKB_SET_CONTROLS_MASK,
+ desc);
+
+ XkbFreeKeyboard (desc, XkbAllComponentsMask, True);
+--
+cgit v0.9.0.2
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=36620&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:39:29 2013
@@ -3,6 +3,7 @@
03_print_async.patch
04_superP.patch
05_sound_pkg-config.patch
+06_a11y_macro.patch
06_a11y_gdm_leak.patch
10_smaller_syndaemon_timeout.patch
power-check-null-devices.patch
More information about the pkg-gnome-commits
mailing list