summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Wimpress <[email protected]>2015-06-09 22:18:00 +0100
committerMartin Wimpress <[email protected]>2015-06-09 22:18:00 +0100
commit37c287f0a695b58f3261aeeb0954e17f1ae272d2 (patch)
tree91c777ae38e7053e9e3f29873bbdf08852a3ca1b /src
parent1d47265e8aab0424be8500a40dc9de87eaf0e972 (diff)
parent862476b1381596a6ec0a05d56e243bfdff91f00c (diff)
downloadmarco-37c287f0a695b58f3261aeeb0954e17f1ae272d2.tar.bz2
marco-37c287f0a695b58f3261aeeb0954e17f1ae272d2.tar.xz
Merge pull request #189 from monsta/keybindings-fix
prefs: make keybindings change notifications work with GLib >= 2.43
Diffstat (limited to 'src')
-rw-r--r--src/core/prefs.c45
1 files changed, 25 insertions, 20 deletions
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 09431727..1726db6d 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -162,7 +162,9 @@ static void button_layout_handler (MetaPreference, const gchar*, gboolean*);
static gboolean update_binding (MetaKeyPref *binding,
gchar *value);
-static void init_bindings (void);
+static void init_bindings (GSettings *);
+static void init_screen_bindings (void);
+static void init_window_bindings (void);
static void init_commands (void);
static void init_workspace_names (void);
@@ -909,7 +911,8 @@ meta_prefs_init (void)
handle_preference_init_string ();
handle_preference_init_int ();
- init_bindings ();
+ init_screen_bindings ();
+ init_window_bindings ();
init_commands ();
init_workspace_names ();
}
@@ -1582,32 +1585,32 @@ static MetaKeyPref key_bindings[] = {
#undef keybind
static void
-init_bindings (void)
+init_bindings (GSettings *settings)
{
- const char *prefix[] = {
- KEY_WINDOW_BINDINGS_SCHEMA,
- KEY_SCREEN_BINDINGS_SCHEMA,
- NULL
- };
- int i;
gchar **list = NULL;
gchar *str_val = NULL;
- GSettings *bindings_settings = NULL;
- for (i = 0; prefix[i]; i++)
+ list = g_settings_list_keys (settings);
+ while (*list != NULL)
{
- bindings_settings = g_settings_new (prefix [i]);
- list = g_settings_list_keys (bindings_settings);
- while (*list != NULL)
- {
- str_val = g_settings_get_string (bindings_settings, *list);
- update_key_binding (*list, str_val);
- list++;
- }
+ str_val = g_settings_get_string (settings, *list);
+ update_key_binding (*list, str_val);
+ list++;
}
+
g_free (str_val);
- g_object_unref (bindings_settings);
+}
+static void
+init_screen_bindings (void)
+{
+ init_bindings (settings_screen_bindings);
+}
+
+static void
+init_window_bindings (void)
+{
+ init_bindings (settings_window_bindings);
}
static void
@@ -1623,6 +1626,7 @@ init_commands (void)
update_command (*list, str_val);
list++;
}
+
g_free (str_val);
}
@@ -1639,6 +1643,7 @@ init_workspace_names (void)
update_workspace_name (*list, str_val);
list++;
}
+
g_free (str_val);
}