Author: nick
Date: 2008-10-23 17:35:49 +0000 (Thu, 23 Oct 2008)
New Revision: 28386
Modified:
xfce4-panel/trunk/configure.in.in
xfce4-panel/trunk/panel/panel-app.c
Log:
* Implement SmRestartImmediately (Bug #4516).
Modified: xfce4-panel/trunk/configure.in.in
===================================================================
--- xfce4-panel/trunk/configure.in.in 2008-10-23 17:21:22 UTC (rev 28385)
+++ xfce4-panel/trunk/configure.in.in 2008-10-23 17:35:49 UTC (rev 28386)
@@ -110,7 +110,7 @@
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])
Modified: xfce4-panel/trunk/panel/panel-app.c
===================================================================
--- xfce4-panel/trunk/panel/panel-app.c 2008-10-23 17:21:22 UTC (rev 28385)
+++ xfce4-panel/trunk/panel/panel-app.c 2008-10-23 17:35:49 UTC (rev 28386)
@@ -269,6 +269,10 @@
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.session_client =
client_session_new_full (NULL,
- SESSION_RESTART_IF_RUNNING,
+ SESSION_RESTART_IMMEDIATELY,
40,
client_id,
PACKAGE_NAME,
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
