Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--configure.ac14
-rw-r--r--lib/ev-file-helpers.c3
-rw-r--r--shell/Makefile.am1
-rw-r--r--shell/dummy.cc7
-rw-r--r--shell/ev-window.c6
6 files changed, 26 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index aa6de64..1f9dabe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2005-07-07 Marco Pesenti Gritti <mpg@redhat.com>
+ * shell/ev-window:
+
+ do not unnecessarily save zoom
+
+ * configure.ac:
+ * lib/ev-file-helpers.c: (ev_dot_dir):
+ * shell/Makefile.am:
+ * shell/dummy.cc:
+
+ Some cleanups
+
+2005-07-07 Marco Pesenti Gritti <mpg@redhat.com>
+
* configure.ac:
Remove unnecessary dependencies
diff --git a/configure.ac b/configure.ac
index c467389..d333c89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,11 +4,6 @@ AC_PREREQ(2.57)
AC_INIT(evince, 0.3.2)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-GNOME_COMMON_INIT
-GNOME_MAINTAINER_MODE_DEFINES
-GNOME_COMPILE_WARNINGS
-GNOME_CXX_WARNINGS
-
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@@ -24,6 +19,10 @@ AC_PROG_INTLTOOL
AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
+GNOME_COMMON_INIT
+GNOME_MAINTAINER_MODE_DEFINES
+GNOME_COMPILE_WARNINGS
+GNOME_CXX_WARNINGS
GNOME_DEBUG_CHECK
ALL_LINGUAS="bg ca cs da de el en_CA en_GB es eu fi fr hu ja ko lt nb nl no pt_BR ru rw sk sv th uk wa zh_CN zh_TW"
@@ -34,12 +33,13 @@ GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
+dnl Check dependencies
POPPLER_REQUIRED=0.3.3
DBUS_GLIB_REQUIRED=0.33
GTK_REQUIRED=2.6.0
LIBGNOMEUI_REQUIRED=2.6.0
-PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
+PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0)
PKG_CHECK_MODULES(TOOLBAR_EDITOR, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0)
PKG_CHECK_MODULES(RECENT_FILES, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
PKG_CHECK_MODULES(ZOOM_CONTROL, gtk+-2.0 >= $GTK_REQUIRED)
@@ -107,11 +107,13 @@ if test x$HAVE_NAUTILUS = "xyes"; then
fi
AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes")
+dnl Check for gtk_icon_view_get_visible_range
evince_save_LIBS=$LIBS
LIBS="$LIBS $GTK_LIBS"
AC_CHECK_FUNCS(gtk_icon_view_get_visible_range)
LIBS=$evince_save_LIBS
+dnl GConf configuration
AM_GCONF_SOURCE_2
AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no])
diff --git a/lib/ev-file-helpers.c b/lib/ev-file-helpers.c
index ae8aae5..247e511 100644
--- a/lib/ev-file-helpers.c
+++ b/lib/ev-file-helpers.c
@@ -61,8 +61,7 @@ ev_dot_dir (void)
{
gboolean exists;
- dot_dir = g_build_filename (g_get_home_dir (),
- GNOME_DOT_GNOME,
+ dot_dir = g_build_filename (gnome_user_dir_get (),
"evince",
NULL);
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
}