This should solve the circular dep without requiring dir reorg!

2005-07-07  Marco Pesenti Gritti  <mpg@redhat.com>

        * Makefile.am:
        * backend/Makefile.am:
        * properties/Makefile.am:
        * shell/Makefile.am:
        * thumbnailer/Makefile.am:

        This should solve the circular dep without
        requiring dir reorg!

        * shell/ev-window.c: (setup_view_from_metadata):

        Never restore window size/position when the
        window is already visible.

diff --git a/ChangeLog b/ChangeLog
index 8544a85d6d127e208f83302108066d10aa4431e6..77b6d6d5d826ba0e354623099856c52fd114909b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-07-07  Marco Pesenti Gritti  <mpg@redhat.com>
+
+       * Makefile.am:
+       * backend/Makefile.am:
+       * properties/Makefile.am:
+       * shell/Makefile.am:
+       * thumbnailer/Makefile.am:
+
+       This should solve the circular dep without
+       requiring dir reorg!
+
+       * shell/ev-window.c: (setup_view_from_metadata):
+
+       Never restore window size/position when the
+       window is already visible.
+
 2005-07-06  Christian Persch  <chpe@cvs.gnome.org>
 
        * shell/ev-metadata-manager.c: (ev_metadata_manager_save):

diff --git a/Makefile.am b/Makefile.am
index 7c4883ae784d712146e4eef6e46c2ef825ca180a..abf8666c6f1c3fafda18adb1f97247c704d5507c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = lib cut-n-paste backend po help data
+SUBDIRS = lib cut-n-paste po help data
 
 # Backends
 
@@ -16,9 +16,15 @@ if ENABLE_DVI
      SUBDIRS += dvi
 endif
 
+SUBDIRS += backend
+
+# Properties (library and application)
+
+SUBDIRS += properties
+
 # Applications 
 
-SUBDIRS += shell thumbnailer properties
+SUBDIRS += shell thumbnailer
 
 intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
 

diff --git a/backend/Makefile.am b/backend/Makefile.am
index 35971869909957fcb384fff0d4f6ef74d409d92d..aa54b847b227f5fe6caa605a789a7c9dc3f8802c 100644 (file)
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -46,6 +46,30 @@ libevbackend_la_SOURCES=                     \
        ev-document-misc.c                      \
        $(NULL)
 
+libevbackend_la_LIBADD =                               \
+       $(top_builddir)/pdf/libpdfdocument.la           \
+       $(top_builddir)/pixbuf/libpixbufdocument.la     \
+       $(top_builddir)/ps/libgtkgs.la                  \
+       $(NULL)
+
+if ENABLE_DJVU
+libevbackend_la_LIBADD +=                      \
+       $(top_builddir)/djvu/libgtkdjvu.la      \
+       $(NULL)
+endif
+
+if ENABLE_TIFF
+libevbackend_la_LIBADD +=                      \
+       $(top_builddir)/tiff/libtiffdocument.la \
+       $(NULL)
+endif
+
+if ENABLE_DVI
+libevbackend_la_LIBADD +=                      \
+       $(top_builddir)/dvi/libgtkdvi.la        \
+       $(NULL)
+endif
+
 BUILT_SOURCES=                         \
        ev-backend-marshalers.h         \
        ev-backend-marshalers.c

diff --git a/properties/Makefile.am b/properties/Makefile.am
index e00edd80f59a7250e5c84110043caf00a146c3cc..b5864b162baf0f3f3da9bd4d0f647c513c3e4c3f 100644 (file)
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -32,6 +32,6 @@ libevince_properties_page_la_SOURCES =        \
 libevince_properties_page_la_LIBADD =                  \
        $(PROPERTIES_LIBS)                              \
        libevproperties.la                              \
-       $(top_builddir)/shell/libevbackendfactory.la    \
+       $(top_builddir)/backend/libevbackend.la         \
        $(top_builddir)/lib/libev.la                    \
        -ltiff -lz

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 24e3ab66e52f16407ba6de88147df3bf4f23d3e3..80b6ea50fca29d1ba961df017e8f59843a95c688 100644 (file)
--- 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 d7bfa777defd6666ecc81671b502156445850df6..4f737b47fc7913a415e6537e141426dad6148338 100644 (file)
--- 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) &&

diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index a2f7909eb904061e76c37c10a6f512a5f13203f2..6b57a2cb24eff63df36ef5394293540a878772e6 100644 (file)
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -22,7 +22,7 @@ evince_thumbnailer_LDADD=                             \
        $(THUMBNAILER_LIBS)                             \
        $(LIBTIFF)                                      \
        $(top_builddir)/lib/libev.la                    \
-       $(top_builddir)/shell/libevbackendfactory.la    \
+       $(top_builddir)/backend/libevbackend.la         \
        -ltiff -lz                                      \
        $(NULL)