[gnome-session] gsm: Move auto_save_is_enabled() check to maybe_save_session()



commit c8ddd51c4ae4f145bfd830ff1d5ccea844d0548a
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Mar 22 15:12:35 2011 +0100

    gsm: Move auto_save_is_enabled() check to maybe_save_session()

 gnome-session/gsm-manager.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index f08ddde..b00e298 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -547,8 +547,7 @@ end_phase (GsmManager *manager)
         case GSM_MANAGER_PHASE_QUERY_END_SESSION:
                 break;
         case GSM_MANAGER_PHASE_END_SESSION:
-                if (auto_save_is_enabled (manager))
-                        maybe_save_session (manager);
+                maybe_save_session (manager);
                 break;
         case GSM_MANAGER_PHASE_EXIT:
                 start_next_phase = FALSE;
@@ -2106,6 +2105,10 @@ maybe_save_session (GsmManager *manager)
                 goto out;
         }
 
+        if (!auto_save_is_enabled (manager)) {
+                goto out;
+        }
+
         error = NULL;
         gsm_session_save (manager->priv->clients, &error);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]