gnome-session r5369 - in trunk: . gnome-session

[vuntz svn gnome org]

Author: vuntz
Date: Wed Mar 25 17:02:41 2009
New Revision: 5369
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5369&view=rev

Log:
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()


Modified:
   trunk/ChangeLog
   trunk/gnome-session/gsm-manager.c

Modified: trunk/gnome-session/gsm-manager.c
==============================================================================
--- trunk/gnome-session/gsm-manager.c	(original)
+++ trunk/gnome-session/gsm-manager.c	Wed Mar 25 17:02:41 2009
@@ -392,7 +392,13 @@
         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 @@
                                    (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 @@
                 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 @@
         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);
         }
 }