[Xfce4-commits] <xfce4-panel:master> Panel: Remove autosaving on exit and with timeout.

[Nick Schermer]

Updating branch refs/heads/master
         to 6196070242a05a7f208f2b59fb7b5b5b3e4441ae (commit)
       from e117160f30fc45d4ca0d0eee722921ce74d34e2c (commit)

commit 6196070242a05a7f208f2b59fb7b5b5b3e4441ae
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Dec 29 16:34:44 2011 +0100

    Panel: Remove autosaving on exit and with timeout.
    
    The panel is saving everything when the configuration
    changes, so no need to do that in an interval and during
    exit. It can only lead to data loss.

 panel/main.c              |    4 ----
 panel/panel-application.c |   30 ------------------------------
 2 files changed, 0 insertions(+), 34 deletions(-)

diff --git a/panel/main.c b/panel/main.c
index a70a04f..e5d7839 100644
--- a/panel/main.c
+++ b/panel/main.c
@@ -365,10 +365,6 @@ main (gint argc, gchar **argv)
   /* destroy all the opened dialogs */
   panel_application_destroy_dialogs (application);
 
-  /* only save if we do not quit by the sm client */
-  if (!sm_client_saved_state)
-    panel_application_save (application, TRUE);
-
   g_object_unref (G_OBJECT (application));
   g_object_unref (G_OBJECT (sm_client));
 
diff --git a/panel/panel-application.c b/panel/panel-application.c
index 7e6d1d5..4ea4074 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -68,7 +68,6 @@ static gboolean  panel_application_plugin_insert      (PanelApplication       *a
                                                        gint                    unique_id,
                                                        gchar                 **arguments,
                                                        gint                    position);
-static gboolean  panel_application_save_timeout       (gpointer                user_data);
 static void      panel_application_window_destroyed   (GtkWidget              *window,
                                                        PanelApplication       *application);
 static void      panel_application_dialog_destroyed   (GtkWindow              *dialog,
@@ -127,9 +126,6 @@ struct _PanelApplication
   /* internal list of opened dialogs */
   GSList             *dialogs;
 
-  /* autosave timeout */
-  guint               autosave_timeout_id;
-
 #ifdef GDK_WINDOWING_X11
   guint               wait_for_wm_timeout_id;
 #endif
@@ -202,7 +198,6 @@ panel_application_init (PanelApplication *application)
 
   application->windows = NULL;
   application->dialogs = NULL;
-  application->autosave_timeout_id = 0;
   application->drop_desktop_files = FALSE;
   application->drop_data_ready = FALSE;
   application->drop_occurred = FALSE;
@@ -227,12 +222,6 @@ panel_application_init (PanelApplication *application)
 
   /* get a factory reference so it never unloads */
   application->factory = panel_module_factory_get ();
-
-  /* start the autosave timeout */
-  application->autosave_timeout_id =
-      g_timeout_add_seconds (AUTOSAVE_INTERVAL,
-                             panel_application_save_timeout,
-                             application);
 }
 
 
@@ -245,9 +234,6 @@ panel_application_finalize (GObject *object)
 
   panel_return_if_fail (application->dialogs == NULL);
 
-  /* stop the autosave timeout */
-  g_source_remove (application->autosave_timeout_id);
-
 #ifdef GDK_WINDOWING_X11
   /* stop autostart timeout */
   if (application->wait_for_wm_timeout_id != 0)
@@ -804,22 +790,6 @@ panel_application_plugin_insert (PanelApplication  *application,
 
 
 
-static gboolean
-panel_application_save_timeout (gpointer user_data)
-{
-  panel_return_val_if_fail (PANEL_IS_APPLICATION (user_data), FALSE);
-
-  GDK_THREADS_ENTER ();
-
-  panel_application_save (PANEL_APPLICATION (user_data), TRUE);
-
-  GDK_THREADS_LEAVE ();
-
-  return TRUE;
-}
-
-
-
 static void
 panel_application_window_destroyed (GtkWidget        *window,
                                     PanelApplication *application)