X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-metadata-manager.c;h=067ac6ea28712e404f89262744d2ac680ea51e97;hb=084c2e5beb02de1e5ced358e782db12a502ea65b;hp=0dba983e20c238274e9eadabdb658056bb468a19;hpb=fb53dffc05b5bf6f767a6b33abf6eabb627e7644;p=evince.git

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index 0dba983e..067ac6ea 100644
--- a/shell/ev-metadata-manager.c
+++ b/shell/ev-metadata-manager.c
@@ -59,9 +59,6 @@ struct _EvMetadataManager
 	gboolean	 values_loaded; /* It is true if the file 
 					   has been read */
 
-	gboolean	 modified;	/* It is true if the file 
-					   has top be written */
-
 	guint 		 timeout_id;
 
 	GHashTable	*items;
@@ -93,13 +90,39 @@ item_free (gpointer data)
 	g_free (item);
 }
 
+/**
+ * ev_metadata_arm_timeout
+ *
+ * Setup a timeout for saving the metadata to disk.
+ */
+static void
+ev_metadata_arm_timeout(void)
+{
+	if (ev_metadata_manager->timeout_id)
+		return;
+#if GLIB_CHECK_VERSION (2, 13, 5)
+	ev_metadata_manager->timeout_id =
+		g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE,
+					    2,
+					    (GSourceFunc)ev_metadata_manager_save,
+					    NULL,
+					    NULL);
+#else
+	ev_metadata_manager->timeout_id = 
+		g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
+				    2000, /* 2 sec */
+				    (GSourceFunc)ev_metadata_manager_save,
+				    NULL,
+				    NULL);
+#endif
+}
+
 /**
  * ev_metadata_manager_init:
  *
  * Creates an EvMetadataManager with default values.
  *
  *  values_loaded   ->  %FALSE.
- *  modified        ->  %FALSE.
  *  timeout_id      ->  the id of the event source.
  *  items           ->  a new full empty #GHashTable.
  */
@@ -109,20 +132,12 @@ ev_metadata_manager_init (void)
 	ev_metadata_manager = g_new0 (EvMetadataManager, 1);
 
 	ev_metadata_manager->values_loaded = FALSE;
-	ev_metadata_manager->modified = FALSE;
 
 	ev_metadata_manager->items = 
 		g_hash_table_new_full (g_str_hash, 
 				       g_str_equal, 
 				       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 */
@@ -132,9 +147,11 @@ ev_metadata_manager_shutdown (void)
 	if (ev_metadata_manager == NULL)
 		return;
 
-	g_source_remove (ev_metadata_manager->timeout_id);
-
-	ev_metadata_manager_save (NULL);
+	if (ev_metadata_manager->timeout_id) {
+		g_source_remove (ev_metadata_manager->timeout_id);
+		ev_metadata_manager->timeout_id = 0;
+		ev_metadata_manager_save (NULL);
+	}
 
 	if (ev_metadata_manager->items != NULL)
 		g_hash_table_destroy (ev_metadata_manager->items);
@@ -391,7 +408,7 @@ ev_metadata_manager_set_last (const gchar *key,
 	}
 
 	item->atime = time (NULL);
-	ev_metadata_manager->modified = TRUE;
+	ev_metadata_arm_timeout ();
 	return;
 }
 				 
@@ -526,7 +543,7 @@ ev_metadata_manager_set (const gchar  *uri,
 
 	item->atime = time (NULL);
 
-	ev_metadata_manager->modified = TRUE;
+	ev_metadata_arm_timeout ();
 }
 
 static void
@@ -647,8 +664,7 @@ ev_metadata_manager_save (gpointer data)
 	xmlNodePtr root;
 	gchar *file_name;
 
-	if (!ev_metadata_manager->modified)
-		return TRUE;
+	ev_metadata_manager->timeout_id = 0;
 
 	resize_items ();
 		
@@ -672,9 +688,7 @@ ev_metadata_manager_save (gpointer data)
 	
 	xmlFreeDoc (doc); 
 
-	ev_metadata_manager->modified = FALSE;
-
-	return TRUE;
+	return FALSE;
 }
 
 void