Reset also cups setting to 1 when printing multiple pages per sheet. Fixes

[evince.git] / shell / ev-metadata-manager.c

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index 402beb7096a54203932fe25ad5e47eb3c4a4c36b..067ac6ea28712e404f89262744d2ac680ea51e97 100644 (file)
--- 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;
@@ -103,12 +100,21 @@ 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
 }
 
 /**
@@ -117,7 +123,6 @@ 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.
  */
@@ -127,7 +132,6 @@ 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, 
@@ -143,10 +147,11 @@ 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);
@@ -403,7 +408,6 @@ ev_metadata_manager_set_last (const gchar *key,
        }
 
        item->atime = time (NULL);
-       ev_metadata_manager->modified = TRUE;
        ev_metadata_arm_timeout ();
        return;
 }
@@ -539,7 +543,6 @@ ev_metadata_manager_set (const gchar  *uri,
 
        item->atime = time (NULL);
 
-       ev_metadata_manager->modified = TRUE;
        ev_metadata_arm_timeout ();
 }
 
@@ -663,9 +666,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 +688,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)
 {