Commit 9d14d9e8 authored by Vincent Untz's avatar Vincent Untz Committed by Vincent Untz

put the call that potentially saves the session here, at the end of

2009-03-25  Vincent Untz  <vuntz@gnome.org>

	* gnome-session/gsm-manager.c: (end_phase): put the call that
	potentially saves the session here, at the end of END_SESSION instead
	of many random places
	(do_phase_end_session),
	(do_phase_end_session_part_2), (on_client_end_session_response): remove
	calls to maybe_save_session()

svn path=/trunk/; revision=5369
parent 3ccff855
2009-03-25 Vincent Untz <vuntz@gnome.org>
* gnome-session/gsm-manager.c: (end_phase): put the call that
potentially saves the session here, at the end of END_SESSION instead
of many random places
(do_phase_end_session),
(do_phase_end_session_part_2), (on_client_end_session_response): remove
calls to maybe_save_session()
2009-03-25 Vincent Untz <vuntz@gnome.org>
Remove the END_SESSION_LAST phase since it was considered to break the
......
......@@ -392,7 +392,13 @@ end_phase (GsmManager *manager)
case GSM_MANAGER_PHASE_APPLICATION:
case GSM_MANAGER_PHASE_RUNNING:
case GSM_MANAGER_PHASE_QUERY_END_SESSION:
manager->priv->phase++;
start_phase (manager);
break;
case GSM_MANAGER_PHASE_END_SESSION:
if (auto_save_is_enabled (manager)) {
maybe_save_session (manager);
}
manager->priv->phase++;
start_phase (manager);
break;
......@@ -596,10 +602,6 @@ do_phase_end_session (GsmManager *manager)
(GsmStoreFunc)_client_end_session_helper,
&data);
} else {
if (data.flags & GSM_CLIENT_END_SESSION_FLAG_SAVE) {
maybe_save_session (manager);
}
end_phase (manager);
}
}
......@@ -631,10 +633,6 @@ do_phase_end_session_part_2 (GsmManager *manager)
g_slist_free (manager->priv->next_query_clients);
manager->priv->next_query_clients = NULL;
} else {
if (data.flags & GSM_CLIENT_END_SESSION_FLAG_SAVE) {
maybe_save_session (manager);
}
end_phase (manager);
}
}
......@@ -1798,10 +1796,6 @@ on_client_end_session_response (GsmClient *client,
if (manager->priv->next_query_clients != NULL) {
do_phase_end_session_part_2 (manager);
} else {
if (auto_save_is_enabled (manager)) {
maybe_save_session (manager);
}
end_phase (manager);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment