diff options
| author | Monsta <[email protected]> | 2015-02-18 15:45:38 +0300 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2015-03-08 21:03:41 +0100 |
| commit | 2d1be17303aa8fe96a058a9e1275767fdfeb66b9 (patch) | |
| tree | c255a8f8e716ab02b1630569418a95af5a852d4d /src/core | |
| parent | d4969fe7d0f80f3c5989ace682ddb50b4df26715 (diff) | |
| download | marco-2d1be17303aa8fe96a058a9e1275767fdfeb66b9.tar.bz2 marco-2d1be17303aa8fe96a058a9e1275767fdfeb66b9.tar.xz | |
prefs: first connect to settings, then read them.
fixes the issue with GLib >= 2.43,
https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619
Closes https://github.com/mate-desktop/marco/pull/174
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/prefs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/prefs.c b/src/core/prefs.c index 5f46b554..7f747a20 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -888,13 +888,6 @@ meta_prefs_init (void) g_hash_table_insert (settings_schemas, KEY_MATE_TERMINAL_SCHEMA, settings_mate_terminal); g_hash_table_insert (settings_schemas, KEY_MATE_MOUSE_SCHEMA, settings_mate_mouse); - /* Pick up initial values. */ - - handle_preference_init_enum (); - handle_preference_init_bool (); - handle_preference_init_string (); - handle_preference_init_int (); - g_signal_connect (settings_general, "changed", G_CALLBACK (change_notify), NULL); g_signal_connect (settings_command, "changed", G_CALLBACK (change_notify), NULL); g_signal_connect (settings_screen_bindings, "changed", G_CALLBACK (change_notify), NULL); @@ -907,6 +900,13 @@ meta_prefs_init (void) g_signal_connect (settings_mate_mouse, "changed::" KEY_MATE_MOUSE_CURSOR_THEME, G_CALLBACK (change_notify), NULL); g_signal_connect (settings_mate_mouse, "changed::" KEY_MATE_MOUSE_CURSOR_SIZE, G_CALLBACK (change_notify), NULL); + /* Pick up initial values. */ + + handle_preference_init_enum (); + handle_preference_init_bool (); + handle_preference_init_string (); + handle_preference_init_int (); + init_bindings (); init_commands (); init_workspace_names (); |