X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=4b23975a58d727ef6f4f99cfe438721170701af7;hb=df408ff0086984d7c067ea31f298c0aad002b2e6;hp=d73735629829f0586b7ad3f7f73cfe1cc5037a26;hpb=d375c36972ff3a01b7979984b5a1043eb4c807b0;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index d7373562..4b23975a 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1300,6 +1300,12 @@ ev_window_set_document (EvWindow *ev_window, EvDocument *document)
 					   _("The document contains only empty pages"));
 	}
 
+	if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
+		gtk_widget_destroy (ev_window->priv->presentation_view);
+		ev_window->priv->presentation_view = NULL;
+		ev_window_run_presentation (ev_window);
+	}
+
 	if (ev_window->priv->setup_document_idle > 0)
 		g_source_remove (ev_window->priv->setup_document_idle);
 
@@ -1857,7 +1863,6 @@ ev_window_open_uri (EvWindow       *ev_window,
 	ev_window_close_dialogs (ev_window);
 	ev_window_clear_load_job (ev_window);
 	ev_window_clear_local_uri (ev_window);
-	ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
 
 	ev_window->priv->window_mode = mode;
 
@@ -1896,6 +1901,7 @@ ev_window_open_uri (EvWindow       *ev_window,
 	if (!g_file_is_native (source_file) && !ev_window->priv->local_uri) {
 		ev_window_load_file_remote (ev_window, source_file);
 	} else {
+		ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
 		g_object_unref (source_file);
 		ev_job_scheduler_push_job (ev_window->priv->load_job, EV_JOB_PRIORITY_NONE);
 	}
@@ -2788,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
@@ -2813,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);