diff options
| author | Monsta <[email protected]> | 2015-03-05 13:08:35 +0300 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2015-03-13 08:38:09 +0100 |
| commit | ab7f3a5d3b11ab7368f41d973b00d7c27f7556b1 (patch) | |
| tree | 865b7eda97ebc9ec434e1a5050e610c2f7e0d1b5 | |
| parent | 1abdbdff876def3f061592d0f2317fcefc4d03cb (diff) | |
| download | mate-netbook-ab7f3a5d3b11ab7368f41d973b00d7c27f7556b1.tar.bz2 mate-netbook-ab7f3a5d3b11ab7368f41d973b00d7c27f7556b1.tar.xz | |
maximus: 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/mate-netbook/pull/19
| -rw-r--r-- | maximus/maximus-app.c | 14 | ||||
| -rw-r--r-- | maximus/maximus-bind.c | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/maximus/maximus-app.c b/maximus/maximus-app.c index a1c4221..76aed8e 100644 --- a/maximus/maximus-app.c +++ b/maximus/maximus-app.c @@ -514,23 +514,21 @@ maximus_app_init (MaximusApp *app) priv->settings = g_settings_new (APP_SCHEMA); - priv->exclude_class_list= g_settings_get_strv (priv->settings, APP_EXCLUDE_CLASS); g_signal_connect (priv->settings, "changed::" APP_EXCLUDE_CLASS, G_CALLBACK (on_exclude_class_changed), app); - - priv->undecorate = g_settings_get_boolean (priv->settings, APP_UNDECORATE); g_signal_connect (priv->settings, "changed::" APP_UNDECORATE, G_CALLBACK (on_app_undecorate_changed), app); + g_signal_connect (priv->settings, "changed::" APP_NO_MAXIMIZE, + G_CALLBACK (on_app_no_maximize_changed), app); + priv->exclude_class_list = g_settings_get_strv (priv->settings, APP_EXCLUDE_CLASS); + priv->undecorate = g_settings_get_boolean (priv->settings, APP_UNDECORATE); + priv->no_maximize = g_settings_get_boolean (priv->settings, APP_NO_MAXIMIZE); + g_print ("no maximize: %s\n", priv->no_maximize ? "true" : "false"); priv->screen = screen = wnck_screen_get_default (); g_signal_connect (screen, "window-opened", G_CALLBACK (on_window_opened), app); - - priv->no_maximize = g_settings_get_boolean (priv->settings, APP_NO_MAXIMIZE); - g_print ("no maximize: %s\n", priv->no_maximize ? "true" : "false"); - g_signal_connect (priv->settings, "changed::" APP_NO_MAXIMIZE, - G_CALLBACK (on_app_no_maximize_changed), app); } MaximusApp * diff --git a/maximus/maximus-bind.c b/maximus/maximus-bind.c index 9678b18..e52e0a8 100644 --- a/maximus/maximus-bind.c +++ b/maximus/maximus-bind.c @@ -475,10 +475,11 @@ maximus_bind_init (MaximusBind *bind) tomboy_keybinder_init (); - priv->binding = g_settings_get_string (priv->settings, BIND_EXCLUDE_CLASS); g_signal_connect (priv->settings, "changed::" BIND_EXCLUDE_CLASS, G_CALLBACK (on_binding_changed), bind); + priv->binding = g_settings_get_string (priv->settings, BIND_EXCLUDE_CLASS); + if (binding_is_valid (priv->binding)) tomboy_keybinder_bind (priv->binding, (TomboyBindkeyHandler)on_binding_activated, |