X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=a487c88b7fd63d7bf8c03bc7022e88cd3a6329a5;hb=79a78d0249676255e902c9207a0eec4aba179de6;hp=d7bfa777defd6666ecc81671b502156445850df6;hpb=778d065b076cd3177ed90890dd864ceb8b7f9d98;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index d7bfa777..a487c88b 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -955,12 +955,17 @@ setup_view_from_metadata (EvWindow *window)
 	GValue fullscreen = { 0, };
 
 	/* Window size */
-	if (ev_metadata_manager_get (uri, "window_maximized", &maximized)) {
-		if (g_value_get_boolean (&maximized) && !GTK_WIDGET_VISIBLE (window)) {
-			gtk_window_maximize (GTK_WINDOW (window));
+	if (!GTK_WIDGET_VISIBLE (window)) {
+		gboolean restore_size = TRUE;
+
+		if (ev_metadata_manager_get (uri, "window_maximized", &maximized)) {
+			if (g_value_get_boolean (&maximized)) {
+				gtk_window_maximize (GTK_WINDOW (window));
+				restore_size = FALSE;
+			}
 		}
 
-		if (!g_value_get_boolean (&maximized) &&
+		if (restore_size &&
 		    ev_metadata_manager_get (uri, "window_x", &x) &&
 		    ev_metadata_manager_get (uri, "window_y", &y) &&
 		    ev_metadata_manager_get (uri, "window_width", &width) &&
@@ -2266,8 +2271,10 @@ ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
         update_action_sensitivity (ev_window);
 
 #ifdef ENABLE_METADATA
-	ev_metadata_manager_set_double (ev_window->priv->uri, "zoom",
-				        ev_view_get_zoom (EV_VIEW (ev_window->priv->view)));
+	if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
+		ev_metadata_manager_set_double (ev_window->priv->uri, "zoom",
+					        ev_view_get_zoom (view));
+	}
 #endif
 }