diff options
| author | Christian Persch <chpe@src.gnome.org> | 2009-01-25 15:08:57 (GMT) |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2009-01-25 15:08:57 (GMT) |
| commit | 4912987303aefef0d02a45726b75e5fdae043982 (patch) | |
| tree | 3856f1dc17d3c927436672171532942b997dfe2b /shell | |
| parent | b2c387604ca233c9c70a0595a24d381ddfafd1d4 (diff) | |
Renamed from evince-backend.pc.in. Renamed library to libevdocument.la.
* configure.ac:
* evince-document.pc.in: Renamed from evince-backend.pc.in.
* libdocument/Makefile.am: Renamed library to libevdocument.la.
* libview/Makefile.am:
* shell/Makefile.am:
* backend/*/Makefile.am: Adapt to changed library name.
* libdocument/Makefile.am:
* libview/Makefile.am: Change the installed headers path to match
the directory names in SVN.
* evince-document.h:
* evince-view.h: Add single headers. Bug #568227.
* libdocument/*.h:
* libview/*.h: Add single headers guards.
* libview/Makefile.am:
* libdocument/Makefile.am:
* backend/*/Makefile.am:
* help/reference/Makefile.am: Define EVINCE_COMPILATION, so we can
still include individual headers.
* properties/Makefile.am:
* properties/ev-properties-main.c:
* properties/ev-properties-view.h:
* thumbnailer/Makefile.am:
* thumbnailer/evince-thumbnailer.c: Include only evince-document.h.
* libdocument/Makefile.am:
* libview/Makefile.am: Generate type builtins from all installed headers.
* libdocument/ev-link-action.[ch]:
* libdocument/ev-link-dest.[ch]:
* libdocument/ev-transition-effect.[ch]:
* libview/ev-view.[ch]: Remove handcoded type builtins.
* libdocument/Makefile.am:
* evince-document.h: Add ev-document-factory.h to the public headers.
svn path=/trunk/; revision=3381
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 7 | ||||
| -rw-r--r-- | shell/ev-window.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index ab09ef9..4230dbb 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,6 +1,8 @@ INCLUDES= \ -DDATADIR=\"$(pkgdatadir)\" \ -DGNOMEDATADIR=\"$(datadir)\" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/cut-n-paste/zoom-control/ \ -I$(top_srcdir)/cut-n-paste/toolbar-editor/ \ -I$(top_srcdir)/cut-n-paste/totem-screensaver/ \ @@ -9,10 +11,13 @@ INCLUDES= \ -I$(top_srcdir)/cut-n-paste/evmountoperation/ \ -I$(top_srcdir)/cut-n-paste/smclient/ \ -I$(top_srcdir)/libdocument \ + -I$(top_builddir)/libdocument \ -I$(top_srcdir)/libview \ + -I$(top_builddir)/libview \ -I$(top_srcdir)/properties \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ -DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \ + -DEVINCE_COMPILATION \ $(SHELL_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) @@ -95,7 +100,7 @@ evince_LDADD= \ $(top_builddir)/cut-n-paste/evmountoperation/libevmountoperation.la \ $(top_builddir)/cut-n-paste/smclient/libsmclient.la \ $(top_builddir)/properties/libevproperties.la \ - $(top_builddir)/libdocument/libevbackend.la \ + $(top_builddir)/libdocument/libevdocument.la \ $(top_builddir)/libview/libevview.la \ $(SHELL_LIBS) diff --git a/shell/ev-window.c b/shell/ev-window.c index 6d501da..523a8c6 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -61,6 +61,7 @@ #include "ev-document-images.h" #include "ev-document-links.h" #include "ev-document-thumbnails.h" +#include "ev-document-type-builtins.h" #include "ev-file-exporter.h" #include "ev-file-helpers.h" #include "ev-file-monitor.h" @@ -86,6 +87,7 @@ #include "ev-utils.h" #include "ev-keyring.h" #include "ev-view.h" +#include "ev-view-type-builtins.h" #include "ev-window.h" #include "ev-window-title.h" #include "ev-print-operation.h" @@ -1073,7 +1075,7 @@ setup_view_from_metadata (EvWindow *window) /* Sizing mode */ if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode, FALSE)) { enum_value = g_enum_get_value_by_nick - (EV_SIZING_MODE_CLASS, g_value_get_string (&sizing_mode)); + (g_type_class_peek (EV_TYPE_SIZING_MODE), g_value_get_string (&sizing_mode)); g_value_unset (&sizing_mode); ev_view_set_sizing_mode (view, enum_value->value); } @@ -4082,7 +4084,7 @@ save_sizing_mode (EvWindow *window) GEnumValue *enum_value; mode = ev_view_get_sizing_mode (EV_VIEW (window->priv->view)); - enum_value = g_enum_get_value (EV_SIZING_MODE_CLASS, mode); + enum_value = g_enum_get_value (g_type_class_peek (EV_TYPE_SIZING_MODE), mode); if (!ev_window_is_empty (window)) ev_metadata_manager_set_string (window->priv->uri, "sizing_mode", |