[gnome-control-center] region: Update for the input source switching keybindings move
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] region: Update for the input source switching keybindings move
- Date: Tue, 18 Dec 2012 16:56:39 +0000 (UTC)
commit 4e3a2e1bd5214006e4b0e65616747255dc7d8966
Author: Rui Matos <tiagomatos gmail com>
Date: Wed Dec 12 11:17:02 2012 +0100
region: Update for the input source switching keybindings move
These are now provided by gsettings-desktop-schemas.
https://bugzilla.gnome.org/show_bug.cgi?id=690105
configure.ac | 2 +-
panels/region/gnome-region-panel-input.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 64b3608..f9fc5d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@ NETWORK_MANAGER_REQUIRED_VERSION=0.9.6.4
NETWORK_MANAGER_APPLET_REQUIRED_VERSION=0.9.7
LIBNOTIFY_REQUIRED_VERSION=0.7.3
GNOME_DESKTOP_REQUIRED_VERSION=3.5.91
-SCHEMAS_REQUIRED_VERSION=3.7.2.1
+SCHEMAS_REQUIRED_VERSION=3.7.2.2
LIBWACOM_REQUIRED_VERSION=0.6
CLUTTER_REQUIRED_VERSION=1.11.3
GOA_REQUIRED_VERSION=3.5.90
diff --git a/panels/region/gnome-region-panel-input.c b/panels/region/gnome-region-panel-input.c
index 0dae99b..bd4f04b 100644
--- a/panels/region/gnome-region-panel-input.c
+++ b/panels/region/gnome-region-panel-input.c
@@ -1147,19 +1147,19 @@ update_shortcut_label (GtkWidget *widget,
static void
update_shortcuts (GtkBuilder *builder)
{
- char *previous, *next;
+ char **previous, **next;
GSettings *settings;
- settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys");
+ settings = g_settings_new ("org.gnome.desktop.wm.keybindings");
- previous = g_settings_get_string (settings, "switch-input-source-backward");
- next = g_settings_get_string (settings, "switch-input-source");
+ previous = g_settings_get_strv (settings, "switch-input-source-backward");
+ next = g_settings_get_strv (settings, "switch-input-source");
- update_shortcut_label (WID ("prev-source-shortcut-label"), previous);
- update_shortcut_label (WID ("next-source-shortcut-label"), next);
+ update_shortcut_label (WID ("prev-source-shortcut-label"), previous[0]);
+ update_shortcut_label (WID ("next-source-shortcut-label"), next[0]);
- g_free (previous);
- g_free (next);
+ g_strfreev (previous);
+ g_strfreev (next);
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]