Author: olivier
Date: 2008-10-17 13:10:03 +0000 (Fri, 17 Oct 2008)
New Revision: 28284
Modified:
xfwm4/trunk/ChangeLog
xfwm4/trunk/NEWS
xfwm4/trunk/configure.ac.in
xfwm4/trunk/src/events.c
xfwm4/trunk/src/session.c
Log:
Add support for restart style SmRestartImmediately now that xfce4-session
supports it (requires libxfcegui4 from r28280 or later).
Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog 2008-10-17 13:03:11 UTC (rev 28283)
+++ xfwm4/trunk/ChangeLog 2008-10-17 13:10:03 UTC (rev 28284)
@@ -1,5 +1,11 @@
2008-10-16 olivier
+ * src/events.c, src/session.c: Add support for restart style
+ SmRestartImmediately now that xfce4-session supports it (requires
+ libxfcegui4 from r28280 or later).
+
+2008-10-16 olivier
+
* settings-dialogs/xfwm4-settings.c: Fix compilation with glib-2.10,
there is no g_hash_table_get_keys() nor constructed method for
GObjects in glib-2.10.
Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS 2008-10-17 13:03:11 UTC (rev 28283)
+++ xfwm4/trunk/NEWS 2008-10-17 13:10:03 UTC (rev 28284)
@@ -1,3 +1,8 @@
+4.5.92 (Xfce 4.6beta2)
+======================
+
+- Add support for restart style SmRestartImmediately.
+
4.5.91 (Xfce 4.6beta1)
======================
Modified: xfwm4/trunk/configure.ac.in
===================================================================
--- xfwm4/trunk/configure.ac.in 2008-10-17 13:03:11 UTC (rev 28283)
+++ xfwm4/trunk/configure.ac.in 2008-10-17 13:10:03 UTC (rev 28284)
@@ -7,11 +7,12 @@
m4_define([xfwm4_version_minor], [5])
m4_define([xfwm4_version_micro], [91])
m4_define([xfwm4_version_build], [EMAIL PROTECTED]@])
-m4_define([xfwm4_version_tag], [])
+m4_define([xfwm4_version_tag], [svn])
m4_define([xfwm4_version],
[xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(),
[svn], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.5.91])
+m4_define([libxfcegui4_minimum_version], [4.5.91svn-r28280])
m4_define([xfconf_minimum_version], [4.5.91])
m4_define([xcomposite_minimum_version], [0.2])
m4_define([wnck_minimum_version], [2.12])
@@ -71,7 +72,7 @@
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
XDT_CHECK_PACKAGE([GLADE], [libglade-2.0], [2.0.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [xfce_minimum_version])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], libxfcegui4-1.0, [xfce_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], libxfcegui4-1.0,
[libxfcegui4_minimum_version])
XDT_CHECK_PACKAGE([LIBXFCONF], libxfconf-0, [xfconf_minimum_version])
XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [wnck_minimum_version])
XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2008-10-17 13:03:11 UTC (rev 28283)
+++ xfwm4/trunk/src/events.c 2008-10-17 13:10:03 UTC (rev 28284)
@@ -2449,6 +2449,11 @@
}
else if (display_info->quit)
{
+ /*
+ * Qutting on purpose, update session manager so
+ * it does not restart the program immediately
+ */
+ client_session_set_restart_style(display_info->session,
SESSION_RESTART_IF_RUNNING);
gtk_main_quit ();
}
}
Modified: xfwm4/trunk/src/session.c
===================================================================
--- xfwm4/trunk/src/session.c 2008-10-17 13:03:11 UTC (rev 28283)
+++ xfwm4/trunk/src/session.c 2008-10-17 13:10:03 UTC (rev 28284)
@@ -768,6 +768,7 @@
DisplayInfo *display_info;
display_info = (DisplayInfo *) data;
+ client_session_set_restart_style(display_info->session,
SESSION_RESTART_IF_RUNNING);
display_info->quit = TRUE;
gtk_main_quit ();
}
@@ -778,7 +779,7 @@
SessionClient *session;
display_info->session = client_session_new (argc, argv, (gpointer)
display_info,
- SESSION_RESTART_IF_RUNNING,
20);
+ SESSION_RESTART_IMMEDIATELY,
20);
session = display_info->session;
session->data = (gpointer) display_info;
session->save_phase_2 = sessionSavePhase2;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
