Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/Makefile.am1
-rw-r--r--shell/dummy.cc7
-rw-r--r--shell/ev-window.c6
3 files changed, 4 insertions, 10 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index a95b57d..a8ba810 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -23,7 +23,6 @@ endif
bin_PROGRAMS=evince
evince_SOURCES= \
- dummy.cc \
eggfindbar.c \
eggfindbar.h \
ev-application.c \
diff --git a/shell/dummy.cc b/shell/dummy.cc
deleted file mode 100644
index 645049d..0000000
--- a/shell/dummy.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* This file is just here to fake automake into linking evince as a C++ app
- */
-
-void evince_cpp_stub_dummy (void)
-{
-}
-
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 4f737b4..a487c88 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2271,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
}