[printing] Don't save print document settings into global file

Fixes bug #530018.

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 46ccffb60609542708aa68b53ef2535a87f8b1c3..4b23975a58d727ef6f4f99cfe438721170701af7 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2794,21 +2794,25 @@ ev_window_save_print_settings (EvWindow         *window,
 
        key_file = get_print_settings_file ();
        gtk_print_settings_to_key_file (print_settings, key_file, EV_PRINT_SETTINGS_GROUP);
-       save_print_setting_file (key_file);
-       g_key_file_free (key_file);
-
-       if (!window->priv->metadata)
-               return;
 
        /* Save print settings that are specific to the document */
        for (i = 0; i < G_N_ELEMENTS (document_print_settings); i++) {
-               const gchar *value;
+               /* Remove it from global settings */
+               g_key_file_remove_key (key_file, EV_PRINT_SETTINGS_GROUP,
+                                      document_print_settings[i], NULL);
 
-               value = gtk_print_settings_get (print_settings,
-                                               document_print_settings[i]);
-               ev_metadata_set_string (window->priv->metadata,
-                                       document_print_settings[i], value);
+               if (window->priv->metadata) {
+                       const gchar *value;
+
+                       value = gtk_print_settings_get (print_settings,
+                                                       document_print_settings[i]);
+                       ev_metadata_set_string (window->priv->metadata,
+                                               document_print_settings[i], value);
+               }
        }
+
+       save_print_setting_file (key_file);
+       g_key_file_free (key_file);
 }
 
 static void
@@ -2819,6 +2823,19 @@ ev_window_save_print_page_setup (EvWindow     *window,
 
        key_file = get_print_settings_file ();
        gtk_page_setup_to_key_file (page_setup, key_file, EV_PAGE_SETUP_GROUP);
+
+       /* Do not save document settings in global file */
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-orientation", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-top", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-bottom", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-left", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-right", NULL);
+
        save_print_setting_file (key_file);
        g_key_file_free (key_file);