[printing] Fix multipage even/odd printing issues

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

diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index e86da9735834ae10cf64b0ffb037b2cf15e7c420..a07d2d66d74cd2579f0a89e9c47d2da36665f9c1 100644 (file)
--- 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 <libxml/xmlreader.h>
 
 #include "ev-metadata-manager.h"

+#include "ev-application.h"

 #include "ev-file-helpers.h"
 
 #define METADATA_FILE  "ev-metadata.xml"
 #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)
 {
 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);
 
 
        if (item->values != NULL)
                g_hash_table_destroy (item->values);
 

-       g_free (item);
+       g_slice_free (Item, item);

 }
 
 /**
 }
 
 /**


@@ -100,12 +97,13 @@ ev_metadata_arm_timeout(void)
 {
        if (ev_metadata_manager->timeout_id)
                return;
 {
        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);

 }
 
 /**
 }
 
 /**


@@ -120,7 +118,7 @@ ev_metadata_arm_timeout(void)
 void
 ev_metadata_manager_init (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;
 
 
        ev_metadata_manager->values_loaded = FALSE;
 


@@ -147,7 +145,7 @@ ev_metadata_manager_shutdown (void)
        if (ev_metadata_manager->items != NULL)
                g_hash_table_destroy (ev_metadata_manager->items);
 
        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;
 }
 
        ev_metadata_manager = NULL;
 }
 


@@ -157,7 +155,7 @@ value_free (gpointer data)
        GValue *value = (GValue *)data;
 
        g_value_unset (value);
        GValue *value = (GValue *)data;
 
        g_value_unset (value);

-       g_free (value);
+       g_slice_free (GValue, value);

 }
 
 static GValue *
 }
 
 static GValue *


@@ -167,7 +165,7 @@ parse_value (xmlChar *value, xmlChar *type)
        GValue *ret;
 
        ret_type = g_type_from_name ((char *)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) {
        g_value_init (ret, ret_type);
 
        switch (ret_type) {


@@ -210,7 +208,7 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
                return;
        }
 
                return;
        }
 

-       item = g_new0 (Item, 1);
+       item = g_slice_new0 (Item);

 
        item->atime = g_ascii_strtoull((char*)atime, NULL, 0);
        
 
        item->atime = g_ascii_strtoull((char*)atime, NULL, 0);
        


@@ -274,7 +272,7 @@ load_values ()
        xmlKeepBlanksDefault (0);
 
        /* FIXME: file locking - Paolo */
        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);
        if (!g_file_test (file_name, G_FILE_TEST_EXISTS))
        {
                g_free (file_name);


@@ -371,7 +369,7 @@ ev_metadata_manager_set_last (const gchar *key,
 
        if (item == NULL)
        {
 
        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),
 
                g_hash_table_insert (ev_metadata_manager->items,
                                     g_strdup (LAST_URI),


@@ -386,7 +384,7 @@ ev_metadata_manager_set_last (const gchar *key,
        if (value != NULL) {
                GValue *new;
 
        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);
 
                g_value_init (new, G_VALUE_TYPE (value));
                g_value_copy (value, new);
 


@@ -504,7 +502,7 @@ ev_metadata_manager_set (const gchar  *uri,
 
        if (item == NULL)
        {
 
        if (item == NULL)
        {

-               item = g_new0 (Item, 1);
+               item = g_slice_new0 (Item);

 
                g_hash_table_insert (ev_metadata_manager->items,
                                     g_strdup (uri),
 
                g_hash_table_insert (ev_metadata_manager->items,
                                     g_strdup (uri),


@@ -519,7 +517,7 @@ ev_metadata_manager_set (const gchar  *uri,
        if (value != NULL) {
                GValue *new;
 
        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);
 
                g_value_init (new, G_VALUE_TYPE (value));
                g_value_copy (value, new);
 


@@ -557,7 +555,7 @@ save_values (const gchar *key, GValue *value, xmlNodePtr parent)
 
        switch (G_VALUE_TYPE (value)) {
                case G_TYPE_STRING:
 
        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));
                         break;
                 case G_TYPE_INT:
                        string_value = g_strdup_printf ("%d", g_value_get_int (value));


@@ -566,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));
                        {
                                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:
                        }
                        break;
                 case G_TYPE_BOOLEAN:


@@ -673,7 +671,7 @@ ev_metadata_manager_save (gpointer data)
                          (GHFunc)save_item, root);        
 
        /* FIXME: lock file - Paolo */
                          (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);
        
        xmlSaveFormatFile (file_name, doc, 1);
        g_free (file_name);
        


@@ -714,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);
        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);
 
 
        ev_metadata_manager_set (uri, key, &val);