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=ce164ad56a3284f85e1ad80653d5221f4cc1b62e;hb=f0b7075e647626890908db0d630d88a4e4f779b5;hp=402beb7096a54203932fe25ad5e47eb3c4a4c36b;hpb=82bb28d04f9ac48818cf556131cc908396d69b26;p=evince.git diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c index 402beb70..ce164ad5 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; @@ -81,16 +78,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); } /** @@ -103,12 +96,13 @@ ev_metadata_arm_timeout(void) { if (ev_metadata_manager->timeout_id) return; - ev_metadata_manager->timeout_id = - g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, - 2000, /* 2 sec */ - (GSourceFunc)ev_metadata_manager_save, - NULL, - NULL); + + ev_metadata_manager->timeout_id = + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE, + 2, + (GSourceFunc)ev_metadata_manager_save, + NULL, + NULL); } /** @@ -117,17 +111,15 @@ ev_metadata_arm_timeout(void) * Creates an EvMetadataManager with default values. * * values_loaded -> %FALSE. - * modified -> %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 = g_slice_new0 (EvMetadataManager); ev_metadata_manager->values_loaded = FALSE; - ev_metadata_manager->modified = FALSE; ev_metadata_manager->items = g_hash_table_new_full (g_str_hash, @@ -143,15 +135,16 @@ ev_metadata_manager_shutdown (void) if (ev_metadata_manager == NULL) return; - if (ev_metadata_manager->timeout_id) + if (ev_metadata_manager->timeout_id) { g_source_remove (ev_metadata_manager->timeout_id); - - ev_metadata_manager_save (NULL); + 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); - g_free (ev_metadata_manager); + g_slice_free (EvMetadataManager, ev_metadata_manager); ev_metadata_manager = NULL; } @@ -161,7 +154,7 @@ value_free (gpointer data) GValue *value = (GValue *)data; g_value_unset (value); - g_free (value); + g_slice_free (GValue, value); } static GValue * @@ -171,7 +164,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) { @@ -214,7 +207,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); @@ -375,7 +368,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), @@ -390,7 +383,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); @@ -403,7 +396,6 @@ ev_metadata_manager_set_last (const gchar *key, } item->atime = time (NULL); - ev_metadata_manager->modified = TRUE; ev_metadata_arm_timeout (); return; } @@ -509,7 +501,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), @@ -524,7 +516,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); @@ -539,7 +531,6 @@ ev_metadata_manager_set (const gchar *uri, item->atime = time (NULL); - ev_metadata_manager->modified = TRUE; ev_metadata_arm_timeout (); } @@ -563,7 +554,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)); @@ -572,7 +563,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: @@ -663,9 +654,6 @@ ev_metadata_manager_save (gpointer data) ev_metadata_manager->timeout_id = 0; - if (!ev_metadata_manager->modified) - return FALSE; - resize_items (); xmlIndentTreeOutput = TRUE; @@ -688,22 +676,9 @@ ev_metadata_manager_save (gpointer data) xmlFreeDoc (doc); - ev_metadata_manager->modified = FALSE; - return FALSE; } -void ev_metadata_arm_timeout(void) -{ - if (ev_metadata_manager->timeout_id) - return; - ev_metadata_manager->timeout_id = - g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, - 2000, /* 2 sec */ - (GSourceFunc)ev_metadata_manager_save, - NULL, - NULL); -} void ev_metadata_manager_set_int (const gchar *uri, const gchar *key, int value) {