[gnome-shell] Move magnifier schemas to gsettings-desktop-schemas

[Thomas Wood <thos src gnome org>]

commit cd56de85d01f4797cfd0e8144947ddd454e6c175
Author: Thomas Wood <thomas wood intel com>
Date:   Thu Feb 10 14:20:33 2011 +0000

    Move magnifier schemas to gsettings-desktop-schemas
    
    Move the magnifier schemas to gsettings-desktop-schemas to allow them to be
    shared between gnome-shell and other applications.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=642034

 .gitignore                                         |    2 -
 configure.ac                                       |    1 +
 data/Makefile.am                                   |    5 +-
 ...rg.gnome.accessibility.magnifier.gschema.xml.in |  133 --------------------
 js/ui/magnifier.js                                 |    2 +-
 js/ui/status/accessibility.js                      |    2 +-
 po/POTFILES.in                                     |    1 -
 7 files changed, 4 insertions(+), 142 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a93d334..e01f1ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,6 @@ data/gnome-shell.desktop.in
 data/gschemas.compiled
 data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
-data/org.gnome.accessibility.magnifier.gschema.xml
-data/org.gnome.accessibility.magnifier.gschema.valid
 js/misc/config.js
 intltool-extract.in
 intltool-merge.in
diff --git a/configure.ac b/configure.ac
index 1225e71..20e4347 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,7 @@ PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
 PKG_CHECK_MODULES(JS_TEST, clutter-x11-1.0 gjs-1.0 gobject-introspection-1.0 gtk+-3.0)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
 
 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0],
diff --git a/data/Makefile.am b/data/Makefile.am
index b5d0dc6..359c729 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -55,9 +55,7 @@ dist_theme_DATA =				\
 	theme/ws-switch-arrow-up.svg		\
 	theme/ws-switch-arrow-down.svg
 
-gsettings_SCHEMAS =					\
-	org.gnome.accessibility.magnifier.gschema.xml	\
-	org.gnome.shell.gschema.xml
+gsettings_SCHEMAS = org.gnome.shell.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
@@ -93,7 +91,6 @@ EXTRA_DIST =						\
 	$(menu_DATA)					\
 	$(gconfschema_DATA)				\
 	$(shaders_DATA)					\
-	org.gnome.accessibility.magnifier.gschema.xml.in \
 	org.gnome.shell.gschema.xml.in
 
 CLEANFILES =						\
diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index 91a0e77..3e60c24 100644
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -438,7 +438,7 @@ Magnifier.prototype = {
     },
 
     _settingsInit: function(zoomRegion) {
-        this._settings = new Gio.Settings({ schema: 'org.gnome.accessibility.magnifier' });
+        this._settings = new Gio.Settings({ schema: 'org.gnome.desktop.a11y.magnifier' });
 
         if (zoomRegion) {
             // Mag factor is accurate to two decimal places.
diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index 11a95f3..b6c7b08 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -23,7 +23,7 @@ const KEY_BOUNCE_KEYS_ENABLED = 'bouncekeys-enable';
 const KEY_SLOW_KEYS_ENABLED   = 'slowkeys-enable';
 const KEY_MOUSE_KEYS_ENABLED  = 'mousekeys-enable';
 
-const MAGNIFIER_SCHEMA = 'org.gnome.accessibility.magnifier';
+const MAGNIFIER_SCHEMA = 'org.gnome.desktop.a11y.magnifier';
 const AT_SCREEN_KEYBOARD_SCHEMA = 'org.gnome.desktop.default-applications.at.mobility';
 const AT_SCREEN_READER_SCHEMA   = 'org.gnome.desktop.default-applications.at.visual';
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c49513d..c574872 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 data/gnome-shell.desktop.in.in
 data/org.gnome.shell.gschema.xml.in
-data/org.gnome.accessibility.magnifier.gschema.xml.in
 js/misc/util.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js