X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-metadata-manager.c;h=63ef5e7381ee4c581729fc8fb08c974a5d98dac0;hb=b4400b84fbb899a1984c8e145b91a09de3a35516;hp=f5ab0407b62fee42f21ea874c5f60e745f05a628;hpb=6003391d261ef7940bbc14683f60b242fe347adb;p=evince.git

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index f5ab0407..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);
 
@@ -268,7 +274,7 @@ load_values ()
 	cur = xmlDocGetRootElement (doc);
 	if (cur == NULL) 
 	{
-		g_message ("The metadata file '%s' is empty", METADATA_FILE);
+		g_message ("The metadata file “%s” is empty", METADATA_FILE);
 		xmlFreeDoc (doc);
 	
 		return FALSE;
@@ -276,7 +282,7 @@ load_values ()
 
 	if (xmlStrcmp (cur->name, (const xmlChar *) "metadata")) 
 	{
-		g_message ("File '%s' is of the wrong type", METADATA_FILE);
+		g_message ("File “%s” is of the wrong type", METADATA_FILE);
 		xmlFreeDoc (doc);
 		
 		return FALSE;
@@ -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
@@ -539,8 +547,12 @@ save_values (const gchar *key, GValue *value, xmlNodePtr parent)
 			string_value = g_strdup_printf ("%d", g_value_get_int (value));
                         break;
                 case G_TYPE_DOUBLE:
-			string_value = g_strdup_printf ("%f", g_value_get_double (value));
-                        break;
+            		{
+            			gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
+            			g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE, g_value_get_double (value));
+				string_value = g_strdup_printf ("%s", buf);
+			}
+            	        break;
                 case G_TYPE_BOOLEAN:
 			string_value = g_strdup_printf ("%d", g_value_get_boolean (value));
                         break;
@@ -627,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 ();
 		
@@ -654,7 +668,7 @@ ev_metadata_manager_save (gpointer data)
 
 	ev_metadata_manager->modified = FALSE;
 
-	return TRUE;
+	return FALSE;
 }
 
 void