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=c3fc4226e317616c733d9d0ca40c2cbd187c4ee8;hb=61a9bef64099404d5a7464891a6db4066dd4e7c1;hp=b6638c95b862b6089bfc03d1ebd666f080d9c5f9;hpb=3a413acda20ebb24ae0256bcc0fa0919a2fd575e;p=evince.git

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index b6638c95..c3fc4226 100644
--- 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;
 }
 
+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)
 {
@@ -142,13 +151,13 @@ parse_value (xmlChar *value, xmlChar *type)
 			g_value_set_string (ret, (char *)value);
 			break;
 		case G_TYPE_INT:
-			g_value_set_int (ret, atoi ((char *)value));
+			g_value_set_int (ret, g_ascii_strtoull ((char *)value, NULL, 0));
 			break;
 		case G_TYPE_DOUBLE:
-			g_value_set_double (ret, atof ((char *)value));
+			g_value_set_double (ret, g_ascii_strtod ((char *)value, NULL));
 			break;
 		case G_TYPE_BOOLEAN:
-			g_value_set_boolean (ret, atoi ((char *)value));
+			g_value_set_boolean (ret, g_ascii_strtoull ((char *)value, NULL, 0));
 			break;
 	}
 
@@ -179,12 +188,12 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
 
 	item = g_new0 (Item, 1);
 
-	item->atime = atol ((char *)atime);
+	item->atime = g_ascii_strtoull((char*)atime, NULL, 0);
 	
 	item->values = g_hash_table_new_full (g_str_hash, 
 					      g_str_equal, 
 					      g_free, 
-					      g_free);
+					      value_free);
 
 	cur = cur->xmlChildrenNode;
 		
@@ -195,7 +204,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 +218,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 +268,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 +276,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 +297,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
@@ -378,6 +379,17 @@ ev_metadata_manager_set_last (const gchar *key,
 	return;
 }
 				 
+/**
+ * ev_metadata_manager_set:
+ * @uri: Uri to set data for, if @NULL, we return default value
+ * @key: Key to set uri
+ * @value: GValue struct filled up with value
+ * @ignore_last: if @TRUE, default value is ignored
+ * 
+ * Retrieve value for uri in metadata database
+ * 
+ * Returns: @TRUE if value was taken.
+ **/
 gboolean
 ev_metadata_manager_get (const gchar *uri,
 			 const gchar *key,
@@ -427,6 +439,14 @@ ev_metadata_manager_get (const gchar *uri,
 	return ev_metadata_manager_get_last (key, value, ignore_last);
 }
 
+/**
+ * ev_metadata_manager_set:
+ * @uri: Uri to set data for, if @NULL, we set default value
+ * @key: Key to set uri
+ * @value: GValue struct containing value
+ * 
+ * Set value for key in metadata database
+ **/
 void
 ev_metadata_manager_set (const gchar  *uri,
 			 const gchar  *key,
@@ -519,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 ("%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;
@@ -550,10 +574,8 @@ save_item (const gchar *key, const gpointer *data, xmlNodePtr parent)
 	
 	xmlSetProp (xml_node, (const xmlChar *)"uri", (const xmlChar *)key);
 
-	/* FIXME: is the cast right? - Paolo */
-	atime = g_strdup_printf ("%d", (int)item->atime);
-	xmlSetProp (xml_node, (const xmlChar *)"atime", (const xmlChar *)atime);	
-
+	atime = g_strdup_printf ("%ld", item->atime);
+	xmlSetProp (xml_node, (const xmlChar *)"atime", (const xmlChar *)atime);
 	g_free (atime);
 
     	g_hash_table_foreach (item->values,