diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 30 | ||||
| -rw-r--r-- | shell/ev-window.c | 13 |
2 files changed, 10 insertions, 33 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 24e3ab6..80b6ea5 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -20,34 +20,6 @@ INCLUDES += $(DBUS_CFLAGS) endif bin_PROGRAMS=evince -noinst_LTLIBRARIES = libevbackendfactory.la - -libevbackendfactory_la_SOURCES = - -libevbackendfactory_la_LIBADD = \ - $(top_builddir)/pdf/libpdfdocument.la \ - $(top_builddir)/pixbuf/libpixbufdocument.la \ - $(top_builddir)/ps/libgtkgs.la \ - $(top_builddir)/backend/libevbackend.la \ - $(NULL) - -if ENABLE_DJVU -libevbackendfactory_la_LIBADD += \ - $(top_builddir)/djvu/libgtkdjvu.la \ - $(NULL) -endif - -if ENABLE_TIFF -libevbackendfactory_la_LIBADD += \ - $(top_builddir)/tiff/libtiffdocument.la \ - $(NULL) -endif - -if ENABLE_DVI -libevbackendfactory_la_LIBADD += \ - $(top_builddir)/dvi/libgtkdvi.la \ - $(NULL) -endif evince_SOURCES= \ dummy.cc \ @@ -116,8 +88,8 @@ evince_LDADD= \ $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \ $(top_builddir)/properties/libevproperties.la \ $(top_builddir)/lib/libev.la \ + $(top_builddir)/backend/libevbackend.la \ -ltiff -lz \ - libevbackendfactory.la \ $(NULL) if ENABLE_DBUS diff --git a/shell/ev-window.c b/shell/ev-window.c index d7bfa77..4f737b4 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) && |