X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-metadata-manager.c;h=067ac6ea28712e404f89262744d2ac680ea51e97;hb=595d902c5518765e086e8a911124ef36ed9300b7;hp=4103a3516eeb5db96a44789b530c769813a948af;hpb=68f32e3484d5cabf3e167c4ce1d40bd0991ccb68;p=evince.git diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c index 4103a351..067ac6ea 100644 --- a/shell/ev-metadata-manager.c +++ b/shell/ev-metadata-manager.c @@ -59,9 +59,6 @@ struct _EvMetadataManager gboolean values_loaded; /* It is true if the file has been read */ - gboolean modified; /* It is true if the file - has top be written */ - guint timeout_id; GHashTable *items; @@ -72,6 +69,12 @@ static gboolean ev_metadata_manager_save (gpointer data); static EvMetadataManager *ev_metadata_manager = NULL; +/** + * item_free: + * @data: a pointer to a #Item data + * + * It does free the values on the #GHashTable where data points. + */ static void item_free (gpointer data) { @@ -87,26 +90,54 @@ item_free (gpointer data) g_free (item); } +/** + * ev_metadata_arm_timeout + * + * Setup a timeout for saving the metadata to disk. + */ +static void +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 +} + +/** + * ev_metadata_manager_init: + * + * Creates an EvMetadataManager with default values. + * + * values_loaded -> %FALSE. + * timeout_id -> the id of the event source. + * items -> a new full empty #GHashTable. + */ void ev_metadata_manager_init (void) { ev_metadata_manager = g_new0 (EvMetadataManager, 1); ev_metadata_manager->values_loaded = FALSE; - ev_metadata_manager->modified = FALSE; ev_metadata_manager->items = g_hash_table_new_full (g_str_hash, g_str_equal, 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,9 +147,11 @@ ev_metadata_manager_shutdown (void) if (ev_metadata_manager == NULL) return; - g_source_remove (ev_metadata_manager->timeout_id); - - ev_metadata_manager_save (NULL); + if (ev_metadata_manager->timeout_id) { + g_source_remove (ev_metadata_manager->timeout_id); + ev_metadata_manager->timeout_id = 0; + ev_metadata_manager_save (NULL); + } if (ev_metadata_manager->items != NULL) g_hash_table_destroy (ev_metadata_manager->items); @@ -127,6 +160,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 +226,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 +237,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 +251,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 +301,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 +309,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 +330,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 @@ -374,12 +408,12 @@ ev_metadata_manager_set_last (const gchar *key, } item->atime = time (NULL); - ev_metadata_manager->modified = TRUE; + ev_metadata_arm_timeout (); return; } /** - * ev_metadata_manager_set: + * ev_metadata_manager_get: * @uri: Uri to set data for, if @NULL, we return default value * @key: Key to set uri * @value: GValue struct filled up with value @@ -509,7 +543,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 +572,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 +664,7 @@ ev_metadata_manager_save (gpointer data) xmlNodePtr root; gchar *file_name; - if (!ev_metadata_manager->modified) - return TRUE; + ev_metadata_manager->timeout_id = 0; resize_items (); @@ -651,9 +688,7 @@ ev_metadata_manager_save (gpointer data) xmlFreeDoc (doc); - ev_metadata_manager->modified = FALSE; - - return TRUE; + return FALSE; } void