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=a07d2d66d74cd2579f0a89e9c47d2da36665f9c1;hb=776a6fe02961d8901d21e172633d3c8d1c85dc93;hp=067ac6ea28712e404f89262744d2ac680ea51e97;hpb=0de4e4076b4198674b6fa77c8281cd62a293f2fe;p=evince.git

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index 067ac6ea..a07d2d66 100644
--- a/shell/ev-metadata-manager.c
+++ b/shell/ev-metadata-manager.c
@@ -37,6 +37,7 @@
 #include <libxml/xmlreader.h>
 
 #include "ev-metadata-manager.h"
+#include "ev-application.h"
 #include "ev-file-helpers.h"
 
 #define METADATA_FILE 	"ev-metadata.xml"
@@ -78,16 +79,12 @@ static EvMetadataManager *ev_metadata_manager = NULL;
 static void
 item_free (gpointer data)
 {
-	Item *item;
-	
-	g_return_if_fail (data != NULL);
-
-	item = (Item *)data;
+	Item *item = (Item *) data;
 
 	if (item->values != NULL)
 		g_hash_table_destroy (item->values);
 
-	g_free (item);
+	g_slice_free (Item, item);
 }
 
 /**
@@ -100,21 +97,13 @@ 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
 }
 
 /**
@@ -129,7 +118,7 @@ ev_metadata_arm_timeout(void)
 void
 ev_metadata_manager_init (void)
 {
-	ev_metadata_manager = g_new0 (EvMetadataManager, 1);
+	ev_metadata_manager = g_slice_new0 (EvMetadataManager);
 
 	ev_metadata_manager->values_loaded = FALSE;
 
@@ -156,7 +145,7 @@ ev_metadata_manager_shutdown (void)
 	if (ev_metadata_manager->items != NULL)
 		g_hash_table_destroy (ev_metadata_manager->items);
 
-	g_free (ev_metadata_manager);
+	g_slice_free (EvMetadataManager, ev_metadata_manager);
 	ev_metadata_manager = NULL;
 }
 
@@ -166,7 +155,7 @@ value_free (gpointer data)
 	GValue *value = (GValue *)data;
 
 	g_value_unset (value);
-	g_free (value);
+	g_slice_free (GValue, value);
 }
 
 static GValue *
@@ -176,7 +165,7 @@ parse_value (xmlChar *value, xmlChar *type)
 	GValue *ret;
 
 	ret_type = g_type_from_name ((char *)type);
-	ret = g_new0 (GValue, 1);
+	ret = g_slice_new0 (GValue);
 	g_value_init (ret, ret_type);
 
 	switch (ret_type) {
@@ -219,7 +208,7 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
 		return;
 	}
 
-	item = g_new0 (Item, 1);
+	item = g_slice_new0 (Item);
 
 	item->atime = g_ascii_strtoull((char*)atime, NULL, 0);
 	
@@ -283,7 +272,7 @@ load_values ()
 	xmlKeepBlanksDefault (0);
 
 	/* FIXME: file locking - Paolo */
-	file_name = g_build_filename (ev_dot_dir (), METADATA_FILE, NULL);
+	file_name = g_build_filename (ev_application_get_dot_dir (EV_APP), METADATA_FILE, NULL);
 	if (!g_file_test (file_name, G_FILE_TEST_EXISTS))
 	{
 		g_free (file_name);
@@ -380,7 +369,7 @@ ev_metadata_manager_set_last (const gchar *key,
 
 	if (item == NULL)
 	{
-		item = g_new0 (Item, 1);
+		item = g_slice_new0 (Item);
 
 		g_hash_table_insert (ev_metadata_manager->items,
 				     g_strdup (LAST_URI),
@@ -395,7 +384,7 @@ ev_metadata_manager_set_last (const gchar *key,
 	if (value != NULL) {
 		GValue *new;
 
-		new = g_new0 (GValue, 1);
+		new = g_slice_new0 (GValue);
 	        g_value_init (new, G_VALUE_TYPE (value));
 	        g_value_copy (value, new);
 
@@ -513,7 +502,7 @@ ev_metadata_manager_set (const gchar  *uri,
 
 	if (item == NULL)
 	{
-		item = g_new0 (Item, 1);
+		item = g_slice_new0 (Item);
 
 		g_hash_table_insert (ev_metadata_manager->items,
 				     g_strdup (uri),
@@ -528,7 +517,7 @@ ev_metadata_manager_set (const gchar  *uri,
 	if (value != NULL) {
 		GValue *new;
 
-		new = g_new0 (GValue, 1);
+		new = g_slice_new0 (GValue);
 	        g_value_init (new, G_VALUE_TYPE (value));
 	        g_value_copy (value, new);
 
@@ -566,7 +555,7 @@ save_values (const gchar *key, GValue *value, xmlNodePtr parent)
 
 	switch (G_VALUE_TYPE (value)) {
 		case G_TYPE_STRING:
-			string_value = g_strdup (g_value_get_string (value));
+			string_value = g_value_dup_string (value);
                         break;
                 case G_TYPE_INT:
 			string_value = g_strdup_printf ("%d", g_value_get_int (value));
@@ -575,7 +564,7 @@ save_values (const gchar *key, GValue *value, xmlNodePtr parent)
             		{
             			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);
+				string_value = g_strdup (buf);
 			}
             	        break;
                 case G_TYPE_BOOLEAN:
@@ -682,7 +671,7 @@ ev_metadata_manager_save (gpointer data)
 			  (GHFunc)save_item, root);        
 
 	/* FIXME: lock file - Paolo */
-	file_name = g_build_filename (ev_dot_dir (), METADATA_FILE, NULL);
+	file_name = g_build_filename (ev_application_get_dot_dir (EV_APP), METADATA_FILE, NULL);
 	xmlSaveFormatFile (file_name, doc, 1);
 	g_free (file_name);
 	
@@ -723,7 +712,7 @@ ev_metadata_manager_set_string (const gchar *uri, const gchar *key, const gchar
 	GValue val = { 0, };
 
 	g_value_init (&val, G_TYPE_STRING);
-	g_value_set_string (&val, value);
+	g_value_set_static_string (&val, value);
 
 	ev_metadata_manager_set (uri, key, &val);