don't change the restart type with the session manager when openbox exits. it's not...

[chaz/openbox] / openbox / session.c

diff --git a/openbox/session.c b/openbox/session.c
index fa9ce48459ca6afa68fc8f9c9ad545c9d238aade..f44d3b4c949e8c8c74c9b5eee762fb8d5f971a84 100644 (file)
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -259,28 +259,15 @@ void session_startup(gint argc, gchar **argv)
 
 void session_shutdown()
 {
+    if (sm_disable)
+        return;
+
     g_free(sm_sessions_path);
     g_free(save_file);
     g_free(sm_id);
     g_free(sm_argv);
 
     if (sm_conn) {
-        SmPropValue val_hint;
-        SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, };
-        SmProp *props[1];
-        gulong hint;
-
-        /* when we exit, we want to reset this to a more friendly state */
-        hint = SmRestartIfRunning;
-        val_hint.value = &hint;
-        val_hint.length = 1;
-
-        prop_hint.vals = &val_hint;
-
-        props[0] = &prop_hint;
-
-        SmcSetProperties(sm_conn, 1, props);
-
         SmcCloseConnection(sm_conn, 0, NULL);
 
         while (session_saved_state) {