Added Occitan translation.

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

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index 4103a3516eeb5db96a44789b530c769813a948af..c3fc4226e317616c733d9d0ca40c2cbd187c4ee8 100644 (file)
--- a/shell/ev-metadata-manager.c
+++ b/shell/ev-metadata-manager.c
@@ -127,6 +127,15 @@ ev_metadata_manager_shutdown (void)
        ev_metadata_manager = NULL;
 }
 
        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)
 {
 static GValue *
 parse_value (xmlChar *value, xmlChar *type)
 {


@@ -184,7 +193,7 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
        item->values = g_hash_table_new_full (g_str_hash, 
                                              g_str_equal, 
                                              g_free, 
        item->values = g_hash_table_new_full (g_str_hash, 
                                              g_str_equal, 
                                              g_free, 

-                                             g_free);
+                                             value_free);

 
        cur = cur->xmlChildrenNode;
                
 
        cur = cur->xmlChildrenNode;
                


@@ -195,7 +204,7 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
                        xmlChar *key;
                        xmlChar *xml_value;
                        xmlChar *type;
                        xmlChar *key;
                        xmlChar *xml_value;
                        xmlChar *type;

-                       GValue *value;
+                       GValue  *value;

                        
                        key = xmlGetProp (cur, (const xmlChar *)"key");
                        xml_value = xmlGetProp (cur, (const xmlChar *)"value");
                        
                        key = xmlGetProp (cur, (const xmlChar *)"key");
                        xml_value = xmlGetProp (cur, (const xmlChar *)"value");


@@ -209,6 +218,8 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
 
                        if (key != NULL)
                                xmlFree (key);
 
                        if (key != NULL)
                                xmlFree (key);

+                       if (type != NULL)
+                               xmlFree (type);

                        if (xml_value != NULL)
                                xmlFree (xml_value);
                }
                        if (xml_value != NULL)
                                xmlFree (xml_value);
                }


@@ -257,7 +268,7 @@ load_values ()
        cur = xmlDocGetRootElement (doc);
        if (cur == NULL) 
        {
        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;
                xmlFreeDoc (doc);
        
                return FALSE;


@@ -265,7 +276,7 @@ load_values ()
 
        if (xmlStrcmp (cur->name, (const xmlChar *) "metadata")) 
        {
 
        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;
                xmlFreeDoc (doc);
                
                return FALSE;


@@ -286,16 +297,6 @@ load_values ()
        return TRUE;
 }
 
        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
 #define LAST_URI "last-used-value"
 
 static gboolean


@@ -538,8 +539,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 ("%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;
                 case G_TYPE_BOOLEAN:
                        string_value = g_strdup_printf ("%d", g_value_get_boolean (value));
                         break;