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=cdba8578739fd46880c53fdacc66c58b38278506;hp=a583f3c2bd1d57ce26e179f4ca75f9e202f59a28;hpb=726ead6406199441a1343113fe02a48e278e4c60;p=evince.git

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index a583f3c2..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"
@@ -96,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
 }
 
 /**
@@ -279,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);
@@ -678,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);
 	
@@ -719,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);