From: Nickolay V. Shmyrev <nshmyrev@src.gnome.org>
Date: Sun, 19 Jun 2005 10:38:38 +0000 (+0000)
Subject: Fix update of zoom control. Bug 308268
X-Git-Tag: EVINCE_0_3_3~222
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=c7c3efc21f970868c633bc87b03259b9a7178eff;p=evince.git

Fix update of zoom control. Bug 308268
---

diff --git a/ChangeLog b/ChangeLog
index ececb0b8..27e37a66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-19  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* shell/ev-window.c: (zoom_control_changed_cb):
+	
+	Fix update of zoom control (bug 308268).
+
 Sat Jun 18 22:46:42 2005  Jonathan Blandford  <jrb@redhat.com>
 
 	* shell/ev-properties.c (set_property): escape the text correctly.
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 509ac252..693e0698 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2390,10 +2390,13 @@ zoom_control_changed_cb (EphyZoomAction *action,
 		mode = EV_SIZING_FIT_WIDTH;
 	} else {
 		mode = EV_SIZING_FREE;
-		ev_view_set_zoom (EV_VIEW (ev_window->priv->view), zoom, FALSE);
 	}
 	
 	ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode);
+	
+	if (mode == EV_SIZING_FREE) {
+		ev_view_set_zoom (EV_VIEW (ev_window->priv->view), zoom, FALSE);
+	}
 }
 
 static void