diff options
| author | Victor Kareh <[email protected]> | 2018-02-05 15:22:57 -0500 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-02-06 17:19:42 +0100 |
| commit | daa7f5881476e1b09ee81ec21a4dd40180f69441 (patch) | |
| tree | 8a23ee840ac3b510abc275b349f2f31f2c69dda3 /mate-settings-daemon/main.c | |
| parent | 16137a4d4c51fae1d577ea4c534af4a89f5c1558 (diff) | |
| download | mate-settings-daemon-daa7f5881476e1b09ee81ec21a4dd40180f69441.tar.bz2 mate-settings-daemon-daa7f5881476e1b09ee81ec21a4dd40180f69441.tar.xz | |
Load xsettings during initialization phase
Also set QT_* env variables during init, and restart marco, mate-panel, toggle desktop icons when changing scales
Diffstat (limited to 'mate-settings-daemon/main.c')
| -rw-r--r-- | mate-settings-daemon/main.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/mate-settings-daemon/main.c b/mate-settings-daemon/main.c index da87c36..b070361 100644 --- a/mate-settings-daemon/main.c +++ b/mate-settings-daemon/main.c @@ -519,13 +519,24 @@ main (int argc, char *argv[]) goto out; } + /* If we aren't started by dbus then load the plugins automatically during the + * Initialization phase. Otherwise, wait for an Awake etc. */ + if (g_getenv ("DBUS_STARTER_BUS_TYPE") == NULL) { + error = NULL; + res = mate_settings_manager_start (manager, PLUGIN_LOAD_INIT, &error); + if (! res) { + g_warning ("Unable to start: %s", error->message); + g_error_free (error); + } + } + set_session_over_handler (bus, manager); - /* If we aren't started by dbus then load the plugins - automatically. Otherwise, wait for an Awake etc. */ + /* If we aren't started by dbus then load the plugins automatically after + * mate-settings-daemon has registered itself. Otherwise, wait for an Awake etc. */ if (g_getenv ("DBUS_STARTER_BUS_TYPE") == NULL) { error = NULL; - res = mate_settings_manager_start (manager, &error); + res = mate_settings_manager_start (manager, PLUGIN_LOAD_DEFER, &error); if (! res) { g_warning ("Unable to start: %s", error->message); g_error_free (error); |