Fix update of zoom control. Bug 308268

diff --git a/ChangeLog b/ChangeLog
index ececb0b8ec4473d22a5146106cacf6f2920105f2..27e37a665b9bacb76ded049a284d5204f91e4959 100644 (file)
--- 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 509ac252dcb4e0518675269e25bcf6fedc47ec7a..693e069806c5850961b7a0ebe8e3460f44725437 100644 (file)
--- 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