Minor issue in NEWS

[evince.git] / shell / ev-metadata-manager.c

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index 4103a3516eeb5db96a44789b530c769813a948af..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);
 
@@ -127,6 +133,15 @@ ev_metadata_manager_shutdown (void)
        ev_metadata_manager = NULL;
 }
 
+static void
+value_free (gpointer data)
+{
+       GValue *value = (GValue *)data;
+
+       g_value_unset (value);
+       g_free (value);
+}
+
 static GValue *
 parse_value (xmlChar *value, xmlChar *type)
 {
@@ -184,7 +199,7 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
        item->values = g_hash_table_new_full (g_str_hash, 
                                              g_str_equal, 
                                              g_free, 
-                                             g_free);
+                                             value_free);
 
        cur = cur->xmlChildrenNode;
                
@@ -195,7 +210,7 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
                        xmlChar *key;
                        xmlChar *xml_value;
                        xmlChar *type;
-                       GValue *value;
+                       GValue  *value;
                        
                        key = xmlGetProp (cur, (const xmlChar *)"key");
                        xml_value = xmlGetProp (cur, (const xmlChar *)"value");
@@ -209,6 +224,8 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
 
                        if (key != NULL)
                                xmlFree (key);
+                       if (type != NULL)
+                               xmlFree (type);
                        if (xml_value != NULL)
                                xmlFree (xml_value);
                }
@@ -257,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;
@@ -265,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;
@@ -286,16 +303,6 @@ load_values ()
        return TRUE;
 }
 
-static void
-value_free (gpointer data)
-{
-       GValue *value = (GValue *)data;
-
-       g_value_unset (value);
-       g_free (value);
-}
-
-
 #define LAST_URI "last-used-value"
 
 static gboolean
@@ -375,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;
 }
                                 
@@ -510,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
@@ -538,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;
@@ -626,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 ();
                
@@ -653,7 +668,7 @@ ev_metadata_manager_save (gpointer data)
 
        ev_metadata_manager->modified = FALSE;
 
-       return TRUE;
+       return FALSE;
 }
 
 void