summaryrefslogtreecommitdiff
path: root/mate-session/main.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-10-15 14:43:01 +0200
committerStefano Karapetsas <[email protected]>2013-10-15 14:43:01 +0200
commitab8bb496dcf6abd4fcacc88ea7e1841b6e7905d4 (patch)
treecdfaf04d735991865ac6f7662f386958902055ca /mate-session/main.c
parentb53f83e1fcd8929b9e9275eae098308df2ab5906 (diff)
downloadmate-session-manager-ab8bb496dcf6abd4fcacc88ea7e1841b6e7905d4.tar.bz2
mate-session-manager-ab8bb496dcf6abd4fcacc88ea7e1841b6e7905d4.tar.xz
Add code to start gnome-keyring with proper env vars
Code comes from xfce4-session
Diffstat (limited to 'mate-session/main.c')
-rw-r--r--mate-session/main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mate-session/main.c b/mate-session/main.c
index 6cfbbe6..8608852 100644
--- a/mate-session/main.c
+++ b/mate-session/main.c
@@ -51,6 +51,8 @@
#include "gsm-xsmp-server.h"
#include "gsm-store.h"
+#include "msm-gnome.h"
+
#define GSM_SCHEMA "org.mate.session"
#define GSM_DEFAULT_SESSION_KEY "default-session"
#define GSM_REQUIRED_COMPONENTS_SCHEMA GSM_SCHEMA ".required-components"
@@ -542,6 +544,9 @@ int main(int argc, char** argv)
*/
acquire_name();
+ /* Starts gnome compat mode */
+ msm_gnome_start();
+
manager = gsm_manager_new(client_store, failsafe);
signal_handler = mdm_signal_handler_new();
@@ -583,6 +588,7 @@ int main(int argc, char** argv)
g_object_unref(client_store);
}
+ msm_gnome_stop();
mdm_log_shutdown();
return 0;