* Implement SmRestartImmediately (Bug #4516).

(Old svn revision: 28386)

configure.in.in

@@ -110,7 +110,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.5.91])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.8.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.8.0])
 XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.8.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.5.91])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.5.91svn-r28280])
 XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.91])
 XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0])
 

panel/panel-app.c

@@ -269,6 +269,10 @@ evaluate_run_state (void)
 
     if (quit)
     {
+        /* we quit on purpose, update session manager so 
+         * it does not restart the program immediately */
+        client_session_set_restart_style(panel_app.session_client, SESSION_RESTART_IF_RUNNING);
+        
         if (panel_app.save_id)
         {
             g_source_remove (panel_app.save_id);
@@ -710,7 +714,7 @@ panel_app_run (gchar *client_id)
 
     panel_app.session_client = 
         client_session_new_full (NULL, 
-                                 SESSION_RESTART_IF_RUNNING, 
+                                 SESSION_RESTART_IMMEDIATELY, 
                                  40, 
                                  client_id,
                                  PACKAGE_NAME,