From e69ef41816684c78b04ee91a5c1a4e8a2b8cebc9 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 5 Jun 2007 09:25:17 +0000 Subject: [PATCH] Adapted patch from Arjan van de Ven (arjan@linux.intel.com) to avoid the 2007-06-05 Bastien Nocera * 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 --- ChangeLog | 9 +++++++++ shell/ev-metadata-manager.c | 28 +++++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 064fad84..6824ff98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-06-05 Bastien Nocera + + * 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 * 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 c3fc4226..63ef5e73 100644 --- 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 -- 2.43.5