Adapted patch from Arjan van de Ven (arjan@linux.intel.com) to avoid the

2007-06-05  Bastien Nocera  <hadess@hadess.net>

	* shell/ev-metadata-manager.c: (ev_metadata_arm_timeout),
	(ev_metadata_manager_init), (ev_metadata_manager_shutdown),
	(ev_metadata_manager_set_last), (ev_metadata_manager_set),
	(ev_metadata_manager_save): Adapted patch from Arjan van de
	Ven (arjan@linux.intel.com) to avoid the timeout running all the
	time, saves on power (Closes: #443851)

svn path=/branches/gnome-2-18/; revision=2485

diff --git a/ChangeLog b/ChangeLog
index 064fad84ec699dc8fcf6b7bb222fcf2cfd688bfb..6824ff980c16fe41289cd93fad0da71a2edce69a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-05  Bastien Nocera  <hadess@hadess.net>
+
+       * shell/ev-metadata-manager.c: (ev_metadata_arm_timeout),
+       (ev_metadata_manager_init), (ev_metadata_manager_shutdown),
+       (ev_metadata_manager_set_last), (ev_metadata_manager_set),
+       (ev_metadata_manager_save): Adapted patch from Arjan van de
+       Ven (arjan@linux.intel.com) to avoid the timeout running all the
+       time, saves on power (Closes: #443851)
+
 2007-05-19  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-view.c: (page_changed_cb), (on_adjustment_value_changed):

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index c3fc4226e317616c733d9d0ca40c2cbd187c4ee8..63ef5e7381ee4c581729fc8fb08c974a5d98dac0 100644 (file)
--- a/shell/ev-metadata-manager.c
+++ b/shell/ev-metadata-manager.c
@@ -87,6 +87,17 @@ item_free (gpointer data)
        g_free (item);
 }
 
+void ev_metadata_arm_timeout(void)
+{
+       if (ev_metadata_manager->timeout_id)
+               return;
+       ev_metadata_manager->timeout_id = 
+               g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
+                                   2000, /* 2 sec */
+                                   (GSourceFunc)ev_metadata_manager_save,
+                                   NULL,
+                                   NULL);
+}
 void
 ev_metadata_manager_init (void)
 {
@@ -101,12 +112,6 @@ ev_metadata_manager_init (void)
                                       g_free,
                                       item_free);
 
-       ev_metadata_manager->timeout_id = 
-               g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
-                                   2000, /* 2 sec */
-                                   (GSourceFunc)ev_metadata_manager_save,
-                                   NULL,
-                                   NULL);
 }
 
 /* This function must be called before exiting ev */
@@ -116,7 +121,8 @@ ev_metadata_manager_shutdown (void)
        if (ev_metadata_manager == NULL)
                return;
 
-       g_source_remove (ev_metadata_manager->timeout_id);
+       if (ev_metadata_manager->timeout_id)
+               g_source_remove (ev_metadata_manager->timeout_id);
 
        ev_metadata_manager_save (NULL);
 
@@ -376,6 +382,7 @@ ev_metadata_manager_set_last (const gchar *key,
 
        item->atime = time (NULL);
        ev_metadata_manager->modified = TRUE;
+       ev_metadata_arm_timeout();
        return;
 }
                                 
@@ -511,6 +518,7 @@ ev_metadata_manager_set (const gchar  *uri,
        item->atime = time (NULL);
 
        ev_metadata_manager->modified = TRUE;
+       ev_metadata_arm_timeout();
 }
 
 static void
@@ -631,8 +639,10 @@ ev_metadata_manager_save (gpointer data)
        xmlNodePtr root;
        gchar *file_name;
 
+       ev_metadata_manager->timeout_id = 0;
+
        if (!ev_metadata_manager->modified)
-               return TRUE;
+               return FALSE;
 
        resize_items ();
                
@@ -658,7 +668,7 @@ ev_metadata_manager_save (gpointer data)
 
        ev_metadata_manager->modified = FALSE;
 
-       return TRUE;
+       return FALSE;
 }
 
 void