diff options
| -rw-r--r-- | libmatekbd/matekbd-indicator.c | 17 | ||||
| -rw-r--r-- | libmatekbd/matekbd-status.c | 15 |
2 files changed, 17 insertions, 15 deletions
diff --git a/libmatekbd/matekbd-indicator.c b/libmatekbd/matekbd-indicator.c index d500e85..3a71005 100644 --- a/libmatekbd/matekbd-indicator.c +++ b/libmatekbd/matekbd-indicator.c @@ -816,6 +816,15 @@ matekbd_indicator_global_init (void) matekbd_keyboard_config_init (&globals.kbd_cfg, globals.engine); matekbd_indicator_config_init (&globals.ind_cfg, globals.engine); + matekbd_desktop_config_start_listen (&globals.cfg, + (GCallback) + matekbd_indicator_cfg_changed, + NULL); + matekbd_indicator_config_start_listen (&globals.ind_cfg, + (GCallback) + matekbd_indicator_ind_cfg_changed, + NULL); + matekbd_desktop_config_load_from_gsettings (&globals.cfg); matekbd_desktop_config_activate (&globals.cfg); @@ -836,14 +845,6 @@ matekbd_indicator_global_init (void) xklrec->variants); g_object_unref (G_OBJECT (xklrec)); - matekbd_desktop_config_start_listen (&globals.cfg, - (GCallback) - matekbd_indicator_cfg_changed, - NULL); - matekbd_indicator_config_start_listen (&globals.ind_cfg, - (GCallback) - matekbd_indicator_ind_cfg_changed, - NULL); matekbd_indicator_start_listen (); xkl_debug (100, "*** Inited globals *** \n"); diff --git a/libmatekbd/matekbd-status.c b/libmatekbd/matekbd-status.c index b0c19be..3f6c613 100644 --- a/libmatekbd/matekbd-status.c +++ b/libmatekbd/matekbd-status.c @@ -778,6 +778,14 @@ matekbd_status_global_init (void) matekbd_keyboard_config_init (&globals.kbd_cfg, globals.engine); matekbd_indicator_config_init (&globals.ind_cfg, globals.engine); + matekbd_desktop_config_start_listen (&globals.cfg, + (GCallback) + matekbd_status_cfg_changed, NULL); + matekbd_indicator_config_start_listen (&globals.ind_cfg, + (GCallback) + matekbd_status_ind_cfg_changed, + NULL); + matekbd_desktop_config_load_from_gsettings (&globals.cfg); matekbd_desktop_config_activate (&globals.cfg); @@ -800,13 +808,6 @@ matekbd_status_global_init (void) (const gchar **) xklrec->variants); g_object_unref (G_OBJECT (xklrec)); - matekbd_desktop_config_start_listen (&globals.cfg, - (GCallback) - matekbd_status_cfg_changed, NULL); - matekbd_indicator_config_start_listen (&globals.ind_cfg, - (GCallback) - matekbd_status_ind_cfg_changed, - NULL); matekbd_status_start_listen (); xkl_debug (100, "*** Inited globals *** \n"); |