Author: kelnos
Date: 2008-11-15 12:04:41 +0000 (Sat, 15 Nov 2008)
New Revision: 28810
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/xfce4-session/xfsm-manager.c
Log:
* xfce4-session/xfsm-manager.c: Fix autostart getting run twice when
the failsafe session is used (bug 4486).
Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog 2008-11-15 11:02:53 UTC (rev 28809)
+++ xfce4-session/trunk/ChangeLog 2008-11-15 12:04:41 UTC (rev 28810)
@@ -5,6 +5,11 @@
2008-11-12 Brian Tarricone <[EMAIL PROTECTED]>
+ * xfce4-session/xfsm-manager.c: Fix autostart getting run twice when
+ the failsafe session is used (bug 4486).
+
+2008-11-12 Brian Tarricone <[EMAIL PROTECTED]>
+
* settings/main.c: Hook up Help button.
* settings/xfce4-session-settings.glade: Fix Help button response
and button order.
Modified: xfce4-session/trunk/NEWS
===================================================================
--- xfce4-session/trunk/NEWS 2008-11-15 11:02:53 UTC (rev 28809)
+++ xfce4-session/trunk/NEWS 2008-11-15 12:04:41 UTC (rev 28810)
@@ -1,3 +1,10 @@
+4.5.90.0
+========
+
+- Hook up Help button in settings dialog.
+- Don't let autostart get run twice when using the failsafe session
+ (bug 4486).
+
4.5.92
======
- Hook up Help button in settings dialog.
Modified: xfce4-session/trunk/xfce4-session/xfsm-manager.c
===================================================================
--- xfce4-session/trunk/xfce4-session/xfsm-manager.c 2008-11-15 11:02:53 UTC
(rev 28809)
+++ xfce4-session/trunk/xfce4-session/xfsm-manager.c 2008-11-15 12:04:41 UTC
(rev 28810)
@@ -910,14 +910,13 @@
xfsm_manager_start_client_save_timeout (manager, client);
}
- if ((manager->failsafe_mode || previous_id != NULL)
- && manager->state == XFSM_MANAGER_STARTUP)
+ if (previous_id != NULL && manager->state == XFSM_MANAGER_STARTUP)
{
- /* Only continue the startup if we are either in Failsafe mode (which
- * means that we don't have any previous_id at all) or the previous_id
- * matched one of the starting_properties. If there was no match
- * above, previous_id will be NULL here.
- * See http://bugs.xfce.org/view_bug_page.php?f_id=212 for details.
+ /* Only continue the startup if the previous_id matched one of
+ * the starting_properties. If there was no match above,
+ * previous_id will be NULL here. We don't need to continue when
+ * in failsafe mode because in that case the failsafe session is
+ * started all at once.
*/
if (g_queue_peek_head (manager->starting_properties) == NULL)
xfsm_startup_session_continue (manager);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
