From d8f823a31c5795249ad55227fd5beb3b885c6e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 17 Feb 2011 23:58:34 +0100 Subject: [PATCH] universal-access: Adjust for magnifier schema changes gsettings-desktop-schemas had two conflicting settings for enabling the magnifier: 'show-magnifier' in org.gnome.desktop.a11y.magnifier and 'screen-magnifier-enabled' in org.gnome.desktop.a11y.applications. The former has been removed in favor of the latter, so adjust to this change. --- panels/universal-access/cc-ua-panel.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c index 9d9219c2a..8bd0b2e6b 100644 --- a/panels/universal-access/cc-ua-panel.c +++ b/panels/universal-access/cc-ua-panel.c @@ -45,7 +45,7 @@ struct _CcUaPanelPrivate GSettings *kb_settings; GSettings *mouse_settings; GSettings *font_settings; - GSettings *magnifier_settings; + GSettings *application_settings; GSList *notify_list; }; @@ -133,10 +133,10 @@ cc_ua_panel_dispose (GObject *object) priv->font_settings = NULL; } - if (priv->magnifier_settings) + if (priv->application_settings) { - g_object_unref (priv->magnifier_settings); - priv->magnifier_settings = NULL; + g_object_unref (priv->application_settings); + priv->application_settings = NULL; } G_OBJECT_CLASS (cc_ua_panel_parent_class)->dispose (object); @@ -549,7 +549,8 @@ cc_ua_panel_init_seeing (CcUaPanel *self) WID (priv->builder, "seeing_enable_toggle_keys_checkbutton"), "active", G_SETTINGS_BIND_DEFAULT); - settings_on_off_editor_new (priv, priv->magnifier_settings, "show-magnifier", + settings_on_off_editor_new (priv, priv->application_settings, + "screen-magnifier-enabled", WID (priv->builder, "seeing_zoom_on_radiobutton"), NULL); } @@ -800,7 +801,7 @@ cc_ua_panel_init (CcUaPanel *self) priv->kb_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard"); priv->mouse_settings = g_settings_new ("org.gnome.desktop.a11y.mouse"); priv->font_settings = g_settings_new ("org.gnome.settings-daemon.plugins.xsettings"); - priv->magnifier_settings = g_settings_new ("org.gnome.desktop.a11y.magnifier"); + priv->application_settings = g_settings_new ("org.gnome.desktop.a11y.applications"); cc_ua_panel_init_keyboard (self); cc_ua_panel_init_mouse (self);