Author: kelnos
Date: 2008-11-11 05:14:24 +0000 (Tue, 11 Nov 2008)
New Revision: 28721

Modified:
   xfce4-settings/trunk/xfce4-settings-helper/main.c
Log:
set SmRestartIfRunning if started in debug mode

Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/main.c   2008-11-11 00:56:57 UTC 
(rev 28720)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c   2008-11-11 05:14:24 UTC 
(rev 28721)
@@ -125,7 +125,8 @@
 static gboolean
 xfce_settings_helper_connect_session (int argc,
                                       char **argv,
-                                      const gchar *sm_client_id)
+                                      const gchar *sm_client_id,
+                                      gboolean debug_mode)
 {
     SessionClient *sm_client;
 
@@ -134,7 +135,9 @@
      * from a previous session. */
 
     sm_client = client_session_new (argc, argv, NULL,
-                                    SESSION_RESTART_IMMEDIATELY, 40);
+                                    debug_mode ? SESSION_RESTART_IF_RUNNING
+                                               : SESSION_RESTART_IMMEDIATELY,
+                                    40);
     sm_client->die = sm_client_die;
     if (sm_client_id)
         client_session_set_client_id (sm_client, sm_client_id);
@@ -300,7 +303,7 @@
         }
     }
 
-    xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id);
+    xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, 
opt_debug);
 
     /* create the sub daemons */
     pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, NULL);

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to