]> www.fi.muni.cz Git - evince.git/commitdiff
Renamed from evince-backend.pc.in. Renamed library to libevdocument.la.
authorChristian Persch <chpe@src.gnome.org>
Sun, 25 Jan 2009 15:08:57 +0000 (15:08 +0000)
committerChristian Persch <chpe@src.gnome.org>
Sun, 25 Jan 2009 15:08:57 +0000 (15:08 +0000)
        * 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

75 files changed:
.gitignore [new file with mode: 0644]
ChangeLog
Makefile.am
backend/comics/Makefile.am
backend/djvu/Makefile.am
backend/dvi/Makefile.am
backend/impress/Makefile.am
backend/pdf/Makefile.am
backend/pixbuf/Makefile.am
backend/ps/Makefile.am
backend/tiff/Makefile.am
configure.ac
cut-n-paste/evmountoperation/Makefile.am
cut-n-paste/gimpcellrenderertoggle/Makefile.am
evince-document.h [new file with mode: 0644]
evince-document.pc.in [moved from evince-backend.pc.in with 83% similarity]
evince-view.h [new file with mode: 0644]
evince-view.pc.in
help/reference/Makefile.am
libdocument/Makefile.am
libdocument/ev-async-renderer.h
libdocument/ev-attachment.h
libdocument/ev-backends-manager.h
libdocument/ev-debug.h
libdocument/ev-document-factory.h
libdocument/ev-document-find.h
libdocument/ev-document-fonts.h
libdocument/ev-document-forms.h
libdocument/ev-document-images.h
libdocument/ev-document-info.h
libdocument/ev-document-layers.h
libdocument/ev-document-links.h
libdocument/ev-document-misc.h
libdocument/ev-document-security.h
libdocument/ev-document-thumbnails.h
libdocument/ev-document-transition.h
libdocument/ev-document-type-builtins.c.template
libdocument/ev-document-type-builtins.h.template
libdocument/ev-document.h
libdocument/ev-file-exporter.h
libdocument/ev-file-helpers.h
libdocument/ev-form-field.h
libdocument/ev-image.h
libdocument/ev-layer.h
libdocument/ev-link-action.c
libdocument/ev-link-action.h
libdocument/ev-link-dest.c
libdocument/ev-link-dest.h
libdocument/ev-link.h
libdocument/ev-module.h
libdocument/ev-page.h
libdocument/ev-render-context.h
libdocument/ev-selection.h
libdocument/ev-transition-effect.c
libdocument/ev-transition-effect.h
libview/Makefile.am
libview/ev-job-scheduler.h
libview/ev-jobs.h
libview/ev-page-cache.h
libview/ev-pixbuf-cache.h
libview/ev-timeline.h
libview/ev-transition-animation.h
libview/ev-view-accessible.h
libview/ev-view-private.h
libview/ev-view-type-builtins.c.template
libview/ev-view-type-builtins.h.template
libview/ev-view.c
libview/ev-view.h
properties/Makefile.am
properties/ev-properties-main.c
properties/ev-properties-view.h
shell/Makefile.am
shell/ev-window.c
thumbnailer/Makefile.am
thumbnailer/evince-thumbnailer.c

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..178a612
--- /dev/null
@@ -0,0 +1,41 @@
+*~
+*/*~
+*/*/*~
+*/*/*/*~
+*.orig
+*.rej
+*/*.orig
+*/*.rej
+*/*/*.orig
+*/*/*.rej
+*/*/*/*.orig
+*/*/*/*.rej
+INSTALL
+Makefile.in
+*/Makefile.in
+*/*/Makefile.in
+*/*/*/Makefile.in
+*/*/*/*/Makefile.in
+aclocal.m4
+autom4te.cache
+compile
+config.guess
+config.h.in
+config.sub
+configure
+depcomp
+gnome-doc-utils.make
+gtk-doc.make
+help/reference/*.bak
+help/reference/*.stamp
+help/reference/html
+help/reference/tmpl/*.sgml.bak
+help/reference/xml
+install-sh
+intltool-extract.in
+intltool-merge.in
+intltool-update.in
+ltmain.sh
+missing
+mkinstalldirs
+po/Makefile.in.in
index 61e46ea3af303ec3a8a524ae23326939ee6d781b..06446f8e0572125b024b045a75095dc65de8f237 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2009-01-25  Christian Persch  <chpe@gnome.org>
+
+        * 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.
+
 2009-01-24  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-sidebar-page.c:
index 9fa971094203020f57201f103b435210bd80b59e..de2524acf236e26f4c233d2365bbe8b5f14c4f56 100644 (file)
@@ -14,10 +14,19 @@ if ENABLE_THUMBNAILER
 SUBDIRS += thumbnailer
 endif
 
+NULL =
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
-       evince-backend-$(EV_API_VERSION).pc \
-       evince-view-$(EV_API_VERSION).pc
+       evince-document-$(EV_API_VERSION).pc \
+       evince-view-$(EV_API_VERSION).pc \
+       $(NULL)
+
+headerdir = $(includedir)/evince/$(EV_API_VERSION)
+header_DATA = \
+       evince-document.h \
+       evince-view.h \
+       $(NULL)
 
 # Applications 
 
index 83165eafb76ec27dc849114281cbfc42a50ed135..36a65ae7eea451ac8f9ee95a8cfa29d55d6f4139 100644 (file)
@@ -4,6 +4,7 @@ INCLUDES =                                      \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+       -DEVINCE_COMPILATION                    \
        $(BACKEND_CFLAGS)                       \
        $(LIB_CFLAGS)                           \
        $(WARN_CFLAGS)                          \
@@ -17,7 +18,7 @@ libcomicsdocument_la_SOURCES = \
 
 libcomicsdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libcomicsdocument_la_LIBADD =                          \
-       $(top_builddir)/libdocument/libevbackend.la     \
+       $(top_builddir)/libdocument/libevdocument.la    \
        $(BACKEND_LIBS)                                 \
        $(LIB_LIBS)
 
index 4cd22f57f1e076100393321c84ffe89bc08b8d00..1b94646e6a49a1a7b4cbc0188fc9b83ed10469a8 100644 (file)
@@ -5,6 +5,7 @@ INCLUDES = \
        -I$(top_srcdir)/libdocument                             \
        -DGNOMEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\"   \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"                  \
+       -DEVINCE_COMPILATION                    \
        $(BACKEND_CFLAGS)                                       \
        $(DJVU_CFLAGS)                                          \
        $(WARN_CFLAGS)                                          \
@@ -23,7 +24,7 @@ libdjvudocument_la_SOURCES =  \
 
 libdjvudocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libdjvudocument_la_LIBADD =                            \
-       $(top_builddir)/libdocument/libevbackend.la     \
+       $(top_builddir)/libdocument/libevdocument.la    \
        $(BACKEND_LIBS)                                 \
        $(DJVU_LIBS)
 
index 49bb518822524e88b561074aba55267bc4c79dc7..72afd6a1ce5ff8a856fb4b534eb8f9ce9fc179f5 100644 (file)
@@ -7,6 +7,7 @@ INCLUDES =                                      \
        -I$(top_srcdir)/libdocument             \
        -I$(srcdir)/mdvi-lib                    \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+       -DEVINCE_COMPILATION                    \
        $(WARN_CFLAGS)                          \
        $(BACKEND_CFLAGS)                       \
        $(SPECTRE_CFLAGS)                       \
@@ -26,7 +27,7 @@ libdvidocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libdvidocument_la_LIBADD =                             \
        mdvi-lib/libmdvi.la                             \
        -lkpathsea                                      \
-       $(top_builddir)/libdocument/libevbackend.la     \
+       $(top_builddir)/libdocument/libevdocument.la    \
        $(BACKEND_LIBS)                                 \
        $(SPECTRE_LIBS)
 
index 194e1ba9586dda7fb46321a00948fd4385ef2eee..b7deeb7b0853de807630c876b5b8ea12baf4f607 100644 (file)
@@ -5,6 +5,7 @@ INCLUDES =                                      \
        -I$(top_srcdir)/libdocument             \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
        -DDATADIR=\""$(datadir)"\"              \
+       -DEVINCE_COMPILATION                    \
        $(BACKEND_CFLAGS)                       \
        $(WARN_CFLAGS)                          \
        $(DISABLE_DEPRECATED)
@@ -43,7 +44,7 @@ IMPOSTER_RENDER_INCLUDE_FILES =               \
 
 libimpressdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libimpressdocument_la_LIBADD =                         \
-       $(top_builddir)/libdocument/libevbackend.la     \
+       $(top_builddir)/libdocument/libevdocument.la     \
        $(BACKEND_LIBS)
 
 backend_in_files = impressdocument.evince-backend.in
index d1a9615b5ee507b9941f9ff2a8faea7beb9869e3..10272c89668257a8b54d2dffa2b4e81f0b6cb6cf 100644 (file)
@@ -4,6 +4,7 @@ INCLUDES =                                      \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+       -DEVINCE_COMPILATION                    \
        $(BACKEND_CFLAGS)                       \
        $(POPPLER_CFLAGS)                       \
        $(WARN_CXXFLAGS)                        \
@@ -17,7 +18,7 @@ libpdfdocument_la_SOURCES =                   \
 
 libpdfdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libpdfdocument_la_LIBADD =                             \
-       $(top_builddir)/libdocument/libevbackend.la     \
+       $(top_builddir)/libdocument/libevdocument.la    \
        $(BACKEND_LIBS)                                 \
        $(POPPLER_LIBS)                                 \
        $(CAIRO_PDF_LIBS)                               \
@@ -31,4 +32,4 @@ backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
 
 EXTRA_DIST = $(backend_in_files)
 
-CLEANFILES = $(backend_DATA)
\ No newline at end of file
+CLEANFILES = $(backend_DATA)
index d9b9be928d617daef060f379d5b42c239f0eec3c..decc8da9c43d9463ff440fc7fcd692e88254f397 100644 (file)
@@ -4,6 +4,7 @@ INCLUDES =                                      \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+       -DEVINCE_COMPILATION                    \
        $(BACKEND_CFLAGS)                       \
        $(WARN_CFLAGS)                          \
        $(DISABLE_DEPRECATED)
@@ -16,7 +17,7 @@ libpixbufdocument_la_SOURCES =                \
 
 libpixbufdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libpixbufdocument_la_LIBADD =                          \
-       $(top_builddir)/libdocument/libevbackend.la     \
+       $(top_builddir)/libdocument/libevdocument.la    \
        $(BACKEND_LIBS)
 
 backend_in_files = pixbufdocument.evince-backend.in
index bb079420fbd50f296fdcc67af2358d3bdee5c8d5..0bc6990da573a0f5cee2a0b59a0ccb420ff5599d 100644 (file)
@@ -4,6 +4,7 @@ INCLUDES =                                      \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+       -DEVINCE_COMPILATION                    \
        $(BACKEND_CFLAGS)                       \
        $(SPECTRE_CFLAGS)                       \
        $(WARN_CFLAGS)                          \
@@ -17,7 +18,7 @@ libpsdocument_la_SOURCES =    \
 
 libpsdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libpsdocument_la_LIBADD =                              \
-       $(top_builddir)/libdocument/libevbackend.la     \
+       $(top_builddir)/libdocument/libevdocument.la    \
        $(BACKEND_LIBS)                                 \
        $(SPECTRE_LIBS)
 
@@ -29,4 +30,4 @@ backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
 
 EXTRA_DIST = $(backend_in_files)
 
-CLEANFILES = $(backend_DATA)
\ No newline at end of file
+CLEANFILES = $(backend_DATA)
index 6874a934aa7e73ee82b38dd52ffa209de3b0e901..79ec11e02c86b1e46cd24e2228baf01927c08b12 100644 (file)
@@ -4,6 +4,7 @@ INCLUDES =                                      \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+       -DEVINCE_COMPILATION                    \
        $(BACKEND_CFLAGS)                       \
        $(WARN_CFLAGS)                          \
        $(DISABLE_DEPRECATED)
@@ -18,7 +19,7 @@ libtiffdocument_la_SOURCES =  \
 
 libtiffdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libtiffdocument_la_LIBADD =                            \
-       $(top_builddir)/libdocument/libevbackend.la     \
+       $(top_builddir)/libdocument/libevdocument.la    \
        -ltiff
 
 backend_in_files = tiffdocument.evince-backend.in
index a76cb0a8e035ae9173c02b10992f043e301f9bdd..a19f8fb06bc0013e742e712e5adf13c800d0d6f3 100644 (file)
@@ -21,11 +21,11 @@ m4_define([ev_api_version], [2.25])
 # - If the interface is the same as the previous version, change to C:R+1:A
 
 # Libtool version of the backend library
-m4_define([ev_backend_lt_current],[1])
-m4_define([ev_backend_lt_revision],[0])
-m4_define([ev_backend_lt_age],[0])
-m4_define([ev_backend_lt_version_info],[ev_backend_lt_current:ev_backend_lt_revision:ev_backend_lt_age])
-m4_define([ev_backend_lt_current_minus_age],[m4_eval(ev_backend_lt_current - ev_backend_lt_age)])
+m4_define([ev_document_lt_current],[1])
+m4_define([ev_document_lt_revision],[0])
+m4_define([ev_document_lt_age],[0])
+m4_define([ev_document_lt_version_info],[ev_document_lt_current:ev_document_lt_revision:ev_document_lt_age])
+m4_define([ev_document_lt_current_minus_age],[m4_eval(ev_document_lt_current - ev_document_lt_age)])
 
 # Libtool version of the view library
 m4_define([ev_view_lt_current],[1])
@@ -49,6 +49,7 @@ AM_PROG_LIBTOOL
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
+AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_STDC_HEADERS
 IT_PROG_INTLTOOL([0.35.0])
@@ -456,8 +457,8 @@ AC_SUBST([EV_MICRO_VERSION],[ev_micro_version])
 
 AC_SUBST([EV_API_VERSION],[ev_api_version])
 
-AC_SUBST([EV_BACKEND_LT_VERSION_INFO],[ev_backend_lt_version_info])
-AC_SUBST([EV_BACKEND_LT_CURRENT_MINUS_AGE],[ev_backend_lt_current_minus_age])
+AC_SUBST([EV_DOCUMENT_LT_VERSION_INFO],[ev_document_lt_version_info])
+AC_SUBST([EV_DOCUMENT_LT_CURRENT_MINUS_AGE],[ev_document_lt_current_minus_age])
 AC_SUBST([EV_VIEW_LT_VERSION_INFO],[ev_view_lt_version_info])
 AC_SUBST([EV_VIEW_LT_CURRENT_MINUS_AGE],[ev_view_lt_current_minus_age])
 
@@ -515,7 +516,7 @@ test/Makefile
 thumbnailer/Makefile
 ])
 
-AC_CONFIG_FILES(evince-backend-[]ev_api_version[].pc:evince-backend.pc.in)
+AC_CONFIG_FILES(evince-document-[]ev_api_version[].pc:evince-document.pc.in)
 AC_CONFIG_FILES(evince-view-[]ev_api_version[].pc:evince-view.pc.in)
 
 AC_OUTPUT
index e84c1b4c16bdce069793b4678b1fae0ee2edd7fe..fa7bd440bee02e87edebeef1fbc26fb38467378e 100644 (file)
@@ -7,4 +7,4 @@ libevmountoperation_la_SOURCES =        \
 libevmountoperation_la_CFLAGS =                \
        $(SHELL_CORE_CFLAGS)            \
        $(WARNING_CFLAGS)               \
-       $(DISABLE_DEPRECATED)
\ No newline at end of file
+       $(DISABLE_DEPRECATED)
index 8bc909dd1b04ada19b5fb30d0f9b30f0bf8ab999..1f0b3deaefe238a7287174e52dfc4dd38c816486 100644 (file)
@@ -33,4 +33,4 @@ gimpwidgetsmarshal.c: gimpwidgetsmarshal.h
 gen_sources = xgen-wmh xgen-wmc $(libgimpcellrenderertoggle_la_built_sources)
 CLEANFILES = $(gen_sources)
 
-EXTRA_DIST = $(libgimpcellrenderertoggle_la_extra_sources)
\ No newline at end of file
+EXTRA_DIST = $(libgimpcellrenderertoggle_la_extra_sources)
diff --git a/evince-document.h b/evince-document.h
new file mode 100644 (file)
index 0000000..0f1c13f
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * Copyright Â© 2009 Christian Persch
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
+ */
+
+#ifndef EVINCE_DOCUMENT_H
+#define EVINCE_DOCUMENT_H
+
+#define __EV_EVINCE_DOCUMENT_H_INSIDE__
+
+#include <libdocument/ev-async-renderer.h>
+#include <libdocument/ev-attachment.h>
+#include <libdocument/ev-backends-manager.h>
+#include <libdocument/ev-document-factory.h>
+#include <libdocument/ev-document-find.h>
+#include <libdocument/ev-document-fonts.h>
+#include <libdocument/ev-document-forms.h>
+#include <libdocument/ev-document.h>
+#include <libdocument/ev-document-images.h>
+#include <libdocument/ev-document-info.h>
+#include <libdocument/ev-document-layers.h>
+#include <libdocument/ev-document-links.h>
+#include <libdocument/ev-document-misc.h>
+#include <libdocument/ev-document-security.h>
+#include <libdocument/ev-document-thumbnails.h>
+#include <libdocument/ev-document-transition.h>
+#include <libdocument/ev-document-type-builtins.h>
+#include <libdocument/ev-file-exporter.h>
+#include <libdocument/ev-file-helpers.h>
+#include <libdocument/ev-form-field.h>
+#include <libdocument/ev-image.h>
+#include <libdocument/ev-layer.h>
+#include <libdocument/ev-link-action.h>
+#include <libdocument/ev-link-dest.h>
+#include <libdocument/ev-link.h>
+#include <libdocument/ev-page.h>
+#include <libdocument/ev-render-context.h>
+#include <libdocument/ev-selection.h>
+#include <libdocument/ev-transition-effect.h>
+#include <libdocument/ev-version.h>
+
+#undef __EV_EVINCE_DOCUMENT_H_INSIDE__
+
+#endif /* !EVINCE_DOCUMENT_H */
similarity index 83%
rename from evince-backend.pc.in
rename to evince-document.pc.in
index 21309646200a81aa58f09170d92872ccd8674781..07536df3b6cca888a6a95d071a20e7a3736921a3 100644 (file)
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/evince/@EV_API_VERSION@
 
-Name: Evince Backend
+Name: Evince Document
 Description: GNOME document viewer backend library
 Version: @VERSION@
 Requires: gio-2.0 >= @GLIB_REQUIRED@ gtk+-2.0 >= @GTK_REQUIRED@
-Libs: -L${libdir} -levbackend
+Libs: -L${libdir} -levdocument
 Cflags: -I${includedir}
diff --git a/evince-view.h b/evince-view.h
new file mode 100644 (file)
index 0000000..74e78a8
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+* Copyright Â© 2009 Christian Persch
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
+ */
+
+#ifndef EVINCE_VIEW_H
+#define EVINCE_VIEW_H
+
+#define __EV_EVINCE_VIEW_H_INSIDE__
+
+#include <libview/ev-job-scheduler.h>
+#include <libview/ev-jobs.h>
+#include <libview/ev-page-cache.h>
+#include <libview/ev-view.h>
+#include <libview/ev-view-type-builtins.h>
+
+#undef __EV_EVINCE_VIEW_H_INSIDE__
+
+#endif /* !EVINCE_VIEW_H */
index 28e1f738221af88cbd4e0f0cf2f527e6338101d4..f6e6be4e9eb63c8282fd25a06e74f98f9d9e7bef 100644 (file)
@@ -6,6 +6,6 @@ includedir=@includedir@/evince/@EV_API_VERSION@
 Name: Evince View
 Description: GNOME document viewer view library
 Version: @VERSION@
-Requires: evince-backend-@EV_API_VERSION@ = @VERSION@ gthread-2.0
+Requires: evince-document-@EV_API_VERSION@ = @VERSION@ gthread-2.0
 Libs: -L${libdir} -levview
 Cflags: -I${includedir}
index a8d23c2243f1354ba0b4956a5384911605e7062b..f3ccc0f87f5cbdf677fadd9350f4f044f261cb8c 100644 (file)
@@ -73,6 +73,8 @@ expand_content_files=
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES= \
+       -I$(top_srcdir)                                 \
+       -I$(top_builddir)                               \
        -I$(top_srcdir)/shell \
        -DDATADIR=\"$(pkgdatadir)\"                     \
        -DGNOMEDATADIR=\"$(datadir)\"                   \
@@ -82,10 +84,11 @@ INCLUDES= \
        -I$(top_srcdir)/libdocument                     \
        -I$(top_builddir)/libdocument                   \
        -I$(top_srcdir)/libview                         \
-       -I$(top_builddir)/libview                               \
+       -I$(top_builddir)/libview                       \
        -I$(top_srcdir)/properties                      \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"         \
+       -DEVINCE_COMPILATION                            \
        $(SHELL_CFLAGS)                                 \
        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED)                           \
@@ -101,7 +104,7 @@ GTKDOC_LIBS= \
        $(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.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)                                                   \
        $(GNOME_PRINT_LIBS)                                             \
index a44ed6405310151a4d19aa0d519a57ebf4feff50..0580c62256fbff9a986f4d8f15e1d470578cea5c 100644 (file)
@@ -1,30 +1,14 @@
-INCLUDES=                                              \
-       -DG_LOG_DOMAIN=\"EvDocument\"                   \
-       -DEVINCE_UIDIR=\"$(pkgdatadir)\"                \
-       -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
-       -DEV_BACKENDSDIR=\"$(libdir)/evince/backends\"  \
-       $(LIBDOCUMENT_CFLAGS)                           \
-       $(WARN_CFLAGS)                                  \
-       $(DISABLE_DEPRECATED)
-
-lib_LTLIBRARIES = libevbackend.la
-
-libevbackend_la_LDFLAGS = \
-       -version-info $(EV_BACKEND_LT_VERSION_INFO)     \
-       -export-symbols-regex "^ev_*"   \
-       $(AM_LDFLAGS)
-
-libevbackend_la_LIBADD = $(LIBDOCUMENT_LIBS)
+lib_LTLIBRARIES = libevdocument.la
 
 NOINST_H_FILES =                               \
        ev-debug.h                              \
-       ev-document-factory.h                   \
        ev-module.h
 
 INST_H_FILES =                                         \
        ev-async-renderer.h                     \
        ev-attachment.h                         \
        ev-backends-manager.h                   \
+       ev-document-factory.h                   \
        ev-document-find.h                      \
        ev-document-fonts.h                     \
        ev-document-forms.h                     \
@@ -52,10 +36,10 @@ INST_H_FILES =                                      \
        ev-transition-effect.h                  \
        ev-version.h
 
-headerdir = $(includedir)/evince/$(EV_API_VERSION)/ev-backend
+headerdir = $(includedir)/evince/$(EV_API_VERSION)/libdocument
 header_DATA = $(INST_H_FILES)
 
-libevbackend_la_SOURCES=                       \
+libevdocument_la_SOURCES=                      \
        ev-async-renderer.c                     \
        ev-attachment.c                         \
        ev-backends-manager.c                   \
@@ -89,6 +73,27 @@ libevbackend_la_SOURCES=                     \
        $(NOINST_H_FILES)                       \
        $(INST_H_FILES)
 
+libevdocument_la_CPPFLAGS = \
+       -DG_LOG_DOMAIN=\"EvDocument\"                   \
+       -DEVINCE_UIDIR=\"$(pkgdatadir)\"                \
+       -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
+       -DEV_BACKENDSDIR=\"$(libdir)/evince/backends\"  \
+       -DEVINCE_COMPILATION                            \
+       $(AM_CPPFLAGS)
+
+libevdocument_la_CFLAGS = \
+       $(LIBDOCUMENT_CFLAGS)   \
+       $(WARN_CFLAGS)          \
+       $(DISABLE_DEPRECATED)   \
+       $(AM_CFLAGS)
+
+libevdocument_la_LDFLAGS = \
+       -version-info $(EV_DOCUMENT_LT_VERSION_INFO)    \
+       -export-symbols-regex "^ev_*"   \
+       $(AM_LDFLAGS)
+
+libevdocument_la_LIBADD = $(LIBDOCUMENT_LIBS)
+
 BUILT_SOURCES =                        \
        ev-document-type-builtins.c     \
        ev-document-type-builtins.h
@@ -98,13 +103,13 @@ CLEANFILES = $(BUILT_SOURCES) stamp-ev-document-type-builtins.h
 ev-document-type-builtins.h: stamp-ev-document-type-builtins.h
        @true
 
-stamp-ev-document-type-builtins.h: ev-document-type-builtins.h.template ev-document-info.h
+stamp-ev-document-type-builtins.h: ev-document-type-builtins.h.template $(INST_H_FILES)
        $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
        && (cmp -s xgen-etbh ev-document-type-builtins.h || cp xgen-etbh ev-document-type-builtins.h ) \
        && rm -f xgen-etbh \
        && echo timestamp > $(@F)
 
-ev-document-type-builtins.c: ev-document-type-builtins.c.template ev-document-info.h
+ev-document-type-builtins.c: ev-document-type-builtins.c.template $(INST_H_FILES)
        $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
        && (cmp -s xgen-etbc ev-document-type-builtins.c || cp xgen-etbc ev-document-type-builtins.c ) \
        && rm -f xgen-etbc
@@ -112,4 +117,3 @@ ev-document-type-builtins.c: ev-document-type-builtins.c.template ev-document-in
 EXTRA_DIST = \
        ev-document-type-builtins.c.template \
        ev-document-type-builtins.h.template
-
index e516a0538130efc9a692015d4c6a03979aa3b210..1615187ae842ddc8b3784d1e41518f094ab5e00b 100644 (file)
  *
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_ASYNC_RENDERER_H
 #define EV_ASYNC_RENDERER_H
 
index f163c0a3e839254846de57ddf392e284c1ceeddf..ccc41ba2e0689020f26d750ef190f6d558ecf315 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef __EV_ATTACHMENT_H__
 #define __EV_ATTACHMENT_H__
 
index a78d6f8437c481908865a8f5ce60ab988fbb4fba..4fb165643dedd858ae497ef3edc3db3ed55273ae 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_BACKENDS_MANAGER
 #define EV_BACKENDS_MANAGER
 
index c8b8a34f2381c52a1f322bf4fe13bf83d96788e9..7acb41f03721c707ad6bf41a12f87304c854468e 100644 (file)
 
 /* Modified by Evince Team */
 
+#if !defined (EVINCE_COMPILATION)
+#error "This is a private header."
+#endif
+
 #ifndef __EV_DEBUG_H__
 #define __EV_DEBUG_H__
 
index 82e47a2e3f519378f147c9e52922ad485fb8c5db..6b551817de4a932c7a92e130bf740216eb31f46a 100644 (file)
  *
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_FACTORY_H
 #define EV_DOCUMENT_FACTORY_H
 
index 40db0174c8390999561b9a4becdd931235382dfa..835ca243fd50c946cbe79e7aa7ef287615354d4d 100644 (file)
  *  $Id$
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_FIND_H
 #define EV_DOCUMENT_FIND_H
 
index c9f58f532650ed67f46a73d001c8fcc551226a45..71433a5a8961b4e7634ecb9d66799bd190a5a500 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_FONTS_H
 #define EV_DOCUMENT_FONTS_H
 
index 1337a5ed665ace24d8555a271d146437c629968c..f72b08bbec1baaa9b1556cf9cfc0501589c6aa71 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_FORMS_H
 #define EV_DOCUMENT_FORMS_H
 
index d8699b94bed8751b1c8257bca891d640212d7e31..d9d76965822000af97063320e1419b82718d2690 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_IMAGES_H
 #define EV_DOCUMENT_IMAGES_H
 
index 51d5f7d9e4c099339168886134e91f3cdc7f15dc..a75f6819b458fd90f380d6ce35545a2b5127b6b6 100644 (file)
  *
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_INFO_H
 #define EV_DOCUMENT_INFO_H
 
index 506808bacd299329e712878728502a412796d900..b04c8056d190e4d94b7be58003bdcb9aad018526 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_LAYERS_H
 #define EV_DOCUMENT_LAYERS_H
 
index f6a6a48097f92b81e30c11b5791115a22605b086..b8ea6014ca3ff073c60edcd77ed97e38a51232da 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_LINKS_H
 #define EV_DOCUMENT_LINKS_H
 
index 4c31dc7fc96fd34b9cbc2a3ddbed629999c5781c..5a2ea035d8d209cb8d19bea5872b8bd3256fd71e 100644 (file)
  *  $Id$
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_MISC_H
 #define EV_DOCUMENT_MISC_H
 
index 154a3b1518140c492deaff49da030f01aa3bbd34..298d9b757c8b1b990f9542166de3f31ec4e38520 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_SECURITY_H
 #define EV_DOCUMENT_SECURITY_H
 
index 648c0ebb50f3fb2ad86d871a1fa9c2b29b79ab23..cdcb472edc74429040d340f36e0cde025b93640c 100644 (file)
  *
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_THUMBNAILS_H
 #define EV_DOCUMENT_THUMBNAILS_H
 
index 9171acf5637bff2522c48da5bca844278a1a0e8f..ad2b507bd6057f259d40d56a20106cd6eb32ed4c 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_TRANSITION_H
 #define EV_DOCUMENT_TRANSITION_H
 
index 199683891e1c43c30796c0b2e85ba6ee9e25980a..600a20f2c79dc7df107976afd550371b1bc8ea29 100644 (file)
@@ -1,4 +1,6 @@
 /*** BEGIN file-header ***/
+#include <config.h>
+
 #include "ev-document-type-builtins.h"
 
 /*** END file-header ***/
index 91e3e61ab21cb42a1f42401eff52e9ccda10195e..4b70c87c8237af7bd42acf612cfaa991e68159bd 100644 (file)
@@ -1,5 +1,9 @@
 /*** BEGIN file-header ***/
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_TYPE_BUILTINS_H
 #define EV_DOCUMENT_TYPE_BUILTINS_H
 
index 7cb6d8470551f96e4b5f6574d51dde3ef5dc3278..cfcd5ba6a39fc5ce673b4b63ca1c0268127afda4 100644 (file)
  *  $Id$
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_H
 #define EV_DOCUMENT_H
 
index 6302cd20ac9292169396de1c57e0720c15334594..f623d5f10580fbd7799d579261b32b7d59dd640e 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_FILE_EXPORTER_H
 #define EV_FILE_EXPORTER_H
 
index 833eade90ebf74f40432a62f4f3eb311ce8206b9..2c27b389c4475095075c1282dde89298c177e4d7 100644 (file)
  *  $Id$
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_FILE_HELPERS_H
 #define EV_FILE_HELPERS_H
 
index 027bee60e579e3b16e704b365f935c133b5f8b4c..92dd9fd4bb74935695e33c28ba770395cff9da7b 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_FORM_FIELD_H
 #define EV_FORM_FIELD_H
 
index e603010f1f12fb1a8ff128e1d403c6f6a741b75c..29c1debb742c05757ede62bd15ca3a7f3b8a0865 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef __EV_IMAGE_H__
 #define __EV_IMAGE_H__
 
index 86fc403e0b6d8681e9b0aaecb863f11029b45640..5df33286966af30f43f28009e8f5d286831fc129 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef __EV_LAYER_H__
 #define __EV_LAYER_H__
 
index 52eb9f46a3a6add2a07453d0c3cfd8a073c15766..982ab551c998803eb4ee7fbe4271b98d1f3a1b8b 100644 (file)
@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include "ev-link-action.h"
+#include "ev-document-type-builtins.h"
 
 enum {
        PROP_0,
@@ -55,27 +56,6 @@ G_DEFINE_TYPE (EvLinkAction, ev_link_action, G_TYPE_OBJECT)
 #define EV_LINK_ACTION_GET_PRIVATE(object) \
         (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_LINK_ACTION, EvLinkActionPrivate))
 
-GType
-ev_link_action_type_get_type (void)
-{
-       static GType type = 0;
-
-       if (G_UNLIKELY (type == 0)) {
-               static const GEnumValue values[] = {
-                       { EV_LINK_ACTION_TYPE_GOTO_DEST, "EV_LINK_ACTION_TYPE_GOTO_DEST", "goto-dest" },
-                       { EV_LINK_ACTION_TYPE_GOTO_REMOTE, "EV_LINK_ACTION_TYPE_GOTO_REMOTE", "goto-remote" },
-                       { EV_LINK_ACTION_TYPE_LAUNCH, "EV_LINK_ACTION_TYPE_LAUNCH", "launch" },
-                       { EV_LINK_ACTION_TYPE_EXTERNAL_URI, "EV_LINK_ACTION_TYPE_EXTERNAL_URI", "external-uri"},
-                       { EV_LINK_ACTION_TYPE_NAMED, "EV_LINK_ACTION_TYPE_NAMED", "named"},
-                       { 0, NULL, NULL }
-               };
-
-               type = g_enum_register_static ("EvLinkActionType", values);
-       }
-
-       return type;
-}
-
 EvLinkActionType
 ev_link_action_get_action_type (EvLinkAction *self)
 {
index 32211fe21bf494c1ea19cd8e2432e61f30ddd4dc..19656796fbcdeaae1216aece19a403a146665891 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_LINK_ACTION_H
 #define EV_LINK_ACTION_H
 
@@ -37,8 +41,6 @@ typedef struct _EvLinkActionPrivate EvLinkActionPrivate;
 #define EV_IS_LINK_ACTION_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_LINK_ACTION))
 #define EV_LINK_ACTION_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_LINK_ACTION, EvLinkActionClass))
 
-#define EV_TYPE_LINK_ACTION_TYPE         (ev_link_action_type_get_type ())
-
 typedef enum {
        EV_LINK_ACTION_TYPE_GOTO_DEST,
        EV_LINK_ACTION_TYPE_GOTO_REMOTE,
@@ -49,7 +51,6 @@ typedef enum {
         * actions */
 } EvLinkActionType;
 
-GType            ev_link_action_type_get_type    (void) G_GNUC_CONST;
 GType            ev_link_action_get_type         (void) G_GNUC_CONST;
 
 EvLinkActionType ev_link_action_get_action_type  (EvLinkAction *self);
index b712f9b32a3fcfed21c02b6c3b75fb2723ece675..a1a6b262a822c23d13777e19dbac9d16eefe67ef 100644 (file)
@@ -19,7 +19,9 @@
  */
 
 #include <config.h>
+
 #include "ev-link-dest.h"
+#include "ev-document-type-builtins.h"
 
 enum {
        PROP_0,
@@ -69,31 +71,6 @@ G_DEFINE_TYPE (EvLinkDest, ev_link_dest, G_TYPE_OBJECT)
 #define EV_LINK_DEST_GET_PRIVATE(object) \
         (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_LINK_DEST, EvLinkDestPrivate))
 
-GType
-ev_link_dest_type_get_type (void)
-{
-       static GType type = 0;
-
-       if (G_UNLIKELY (type == 0)) {
-               static const GEnumValue values[] = {
-                       { EV_LINK_DEST_TYPE_PAGE, "EV_LINK_DEST_TYPE_PAGE", "page" },
-                       { EV_LINK_DEST_TYPE_XYZ, "EV_LINK_DEST_TYPE_XYZ", "xyz" },
-                       { EV_LINK_DEST_TYPE_FIT, "EV_LINK_DEST_TYPE_FIT", "fit" },
-                       { EV_LINK_DEST_TYPE_FITH, "EV_LINK_DEST_TYPE_FITH", "fith" },
-                       { EV_LINK_DEST_TYPE_FITV, "EV_LINK_DEST_TYPE_FITV", "fitv" },
-                       { EV_LINK_DEST_TYPE_FITR, "EV_LINK_DEST_TYPE_FITR", "fitr" },
-                       { EV_LINK_DEST_TYPE_NAMED, "EV_LINK_DEST_TYPE_NAMED", "named" },
-                       { EV_LINK_DEST_TYPE_PAGE_LABEL, "EV_LINK_DEST_TYPE_PAGE_LABEL", "page_label" },
-                       { EV_LINK_DEST_TYPE_UNKNOWN, "EV_LINK_DEST_TYPE_UNKNOWN", "unknown" },
-                       { 0, NULL, NULL }
-               };
-
-               type = g_enum_register_static ("EvLinkDestType", values);
-       }
-
-       return type;
-}
-
 EvLinkDestType
 ev_link_dest_get_dest_type (EvLinkDest *self)
 {
index a7ee05951b87fbbf703563f5783666e55bed684d..7cfd7bbafbf45991c9e26beeb4c1c66e7915da69 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_LINK_DEST_H
 #define EV_LINK_DEST_H
 
@@ -36,8 +40,6 @@ typedef struct _EvLinkDestPrivate EvLinkDestPrivate;
 #define EV_IS_LINK_DEST_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_LINK_DEST))
 #define EV_LINK_DEST_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_LINK_DEST, EvLinkDestClass))
 
-#define EV_TYPE_LINK_DEST_TYPE         (ev_link_dest_type_get_type ())
-
 typedef enum {
        EV_LINK_DEST_TYPE_PAGE,
        EV_LINK_DEST_TYPE_XYZ,
@@ -50,7 +52,6 @@ typedef enum {
        EV_LINK_DEST_TYPE_UNKNOWN
 } EvLinkDestType; 
 
-GType           ev_link_dest_type_get_type  (void) G_GNUC_CONST;
 GType           ev_link_dest_get_type       (void) G_GNUC_CONST;
 
 EvLinkDestType  ev_link_dest_get_dest_type  (EvLinkDest  *self);
index 136047c7a5ef333ab144e3082a192b99bdcc89c4..cb3733a720030c52d03a863501579a639c289c34 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_LINK_H
 #define EV_LINK_H
 
index 09d46fa2556599d718882c9e72b32544638b0859..d983c1cf16348fb4a0a043122f3893992ff9f53e 100644 (file)
 
 /* Modified by Evince Team */
  
+#if !defined (EVINCE_COMPILATION)
+#error "This is a private header."
+#endif
+
 #ifndef EV_MODULE_H
 #define EV_MODULE_H
 
index 801b3e19c23403a3a9087a1d73c3b12aa6f0534a..e169a84a8734f4dcb0f3325f1a343344a3ce72ca 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_PAGE_H
 #define EV_PAGE_H
 
index eb324e880f0b465c8e2999246a788cfacf3017ba..96664bb284a4f923b6785e2249ce140632b7d4ee 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_RENDER_CONTEXT_H
 #define EV_RENDER_CONTEXT_H
 
index 59f731c092814deeeea0b60e72790035bad9755c..7a1252a10c7ff4df8b1eb1549c17d594ca4120f8 100644 (file)
  *
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_SELECTION_H
 #define EV_SELECTION_H
 
index 1986b77446fdcd740c17b431c5920080bd27771f..a80fd6acc29728387b210b2543959a1f5a096930 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "ev-transition-effect.h"
 
+#include "ev-document-type-builtins.h"
+
 #define EV_TRANSITION_EFFECT_GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EV_TYPE_TRANSITION_EFFECT, EvTransitionEffectPrivate))
 
 typedef struct EvTransitionEffectPrivate EvTransitionEffectPrivate;
@@ -49,71 +53,6 @@ enum {
 
 G_DEFINE_TYPE (EvTransitionEffect, ev_transition_effect, G_TYPE_OBJECT)
 
-
-GType
-ev_transition_effect_type_get_type (void)
-{
-       static GType type = 0;
-
-       if (G_UNLIKELY (type == 0)) {
-               static const GEnumValue values[] = {
-                       { EV_TRANSITION_EFFECT_REPLACE, "EV_TRANSITION_EFFECT_REPLACE", "replace" },
-                       { EV_TRANSITION_EFFECT_SPLIT, "EV_TRANSITION_EFFECT_SPLIT", "split" },
-                       { EV_TRANSITION_EFFECT_BLINDS, "EV_TRANSITION_EFFECT_BLINDS", "blinds" },
-                       { EV_TRANSITION_EFFECT_BOX, "EV_TRANSITION_EFFECT_BOX", "box" },
-                       { EV_TRANSITION_EFFECT_WIPE, "EV_TRANSITION_EFFECT_WIPE", "wipe" },
-                       { EV_TRANSITION_EFFECT_DISSOLVE, "EV_TRANSITION_EFFECT_DISSOLVE", "dissolve" },
-                       { EV_TRANSITION_EFFECT_GLITTER, "EV_TRANSITION_EFFECT_GLITTER", "glitter" },
-                       { EV_TRANSITION_EFFECT_FLY, "EV_TRANSITION_EFFECT_FLY", "fly" },
-                       { EV_TRANSITION_EFFECT_PUSH, "EV_TRANSITION_EFFECT_PUSH", "push" },
-                       { EV_TRANSITION_EFFECT_COVER, "EV_TRANSITION_EFFECT_COVER", "cover" },
-                       { EV_TRANSITION_EFFECT_UNCOVER, "EV_TRANSITION_EFFECT_UNCOVER", "uncover" },
-                       { EV_TRANSITION_EFFECT_FADE, "EV_TRANSITION_EFFECT_FADE", "fade" },
-                       { 0, NULL, NULL }
-               };
-
-               type = g_enum_register_static ("EvTransitionEffectType", values);
-       }
-
-       return type;
-}
-
-GType
-ev_transition_effect_alignment_get_type (void)
-{
-       static GType type = 0;
-
-       if (G_UNLIKELY (type == 0)) {
-               static const GEnumValue values[] = {
-                       { EV_TRANSITION_ALIGNMENT_HORIZONTAL, "EV_TRANSITION_ALIGNMENT_HORIZONTAL", "horizontal" },
-                       { EV_TRANSITION_ALIGNMENT_VERTICAL, "EV_TRANSITION_ALIGNMENT_VERTICAL", "vertical" },
-                       { 0, NULL, NULL }
-               };
-
-               type = g_enum_register_static ("EvTransitionEffectAlignment", values);
-       }
-
-       return type;
-}
-
-GType
-ev_transition_effect_direction_get_type (void)
-{
-       static GType type = 0;
-
-       if (G_UNLIKELY (type == 0)) {
-               static const GEnumValue values[] = {
-                       { EV_TRANSITION_DIRECTION_INWARD, "EV_TRANSITION_DIRECTION_INWARD", "inward" },
-                       { EV_TRANSITION_DIRECTION_OUTWARD, "EV_TRANSITION_DIRECTION_OUTWARD", "outward" },
-                       { 0, NULL, NULL }
-               };
-
-               type = g_enum_register_static ("EvTransitionEffectDirection", values);
-       }
-
-       return type;
-}
-
 static void
 ev_transition_effect_set_property (GObject     *object,
                                   guint         prop_id,
index 0d778a9a5e30e5974feb22b8d81a2419a88715a4..f1b868ff0805eec7388ab4d0509f9a1f6a7434bf 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef __EV_TRANSITION_EFFECT_H__
 #define __EV_TRANSITION_EFFECT_H__
 
@@ -26,9 +30,6 @@
 G_BEGIN_DECLS
 
 #define EV_TYPE_TRANSITION_EFFECT                (ev_transition_effect_get_type ())
-#define EV_TYPE_TRANSITION_EFFECT_TYPE           (ev_transition_effect_type_get_type ())
-#define EV_TYPE_TRANSITION_EFFECT_ALIGNMENT      (ev_transition_effect_alignment_get_type ())
-#define EV_TYPE_TRANSITION_EFFECT_DIRECTION      (ev_transition_effect_direction_get_type ())
 #define EV_TRANSITION_EFFECT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_TRANSITION_EFFECT, EvTransitionEffect))
 #define EV_TRANSITION_EFFECT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass),  EV_TYPE_TRANSITION_EFFECT, EvTransitionEffectClass))
 #define EV_IS_TRANSITION_EFFECT(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_TRANSITION_EFFECT))
@@ -76,9 +77,6 @@ struct EvTransitionEffectClass
 
 
 GType                 ev_transition_effect_get_type           (void) G_GNUC_CONST;
-GType                 ev_transition_effect_type_get_type      (void) G_GNUC_CONST;
-GType                 ev_transition_effect_alignment_get_type (void) G_GNUC_CONST;
-GType                 ev_transition_effect_direction_get_type (void) G_GNUC_CONST;
 
 EvTransitionEffect   *ev_transition_effect_new                (EvTransitionEffectType  type,
                                                               const gchar            *first_property_name,
index eede6da7729ca7c42bfac442da7ceeecd3965e8c..49720c9e37af004690184651ff457f19588e5d7d 100644 (file)
@@ -1,20 +1,5 @@
-INCLUDES=                                      \
-       -DG_LOG_DOMAIN=\"EvView\"               \
-       -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
-       -I$(top_srcdir)/libdocument             \
-       $(LIBVIEW_CFLAGS)                       \
-       $(WARN_CFLAGS)                          \
-       $(DISABLE_DEPRECATED)
-
 lib_LTLIBRARIES = libevview.la
 
-libevview_la_LDFLAGS = \
-       -version-info $(EV_VIEW_LT_VERSION_INFO)        \
-       -export-symbols-regex "^ev_*"   \
-       $(AM_LDFLAGS)
-
-libevview_la_LIBADD = $(LIBVIEW_LIBS)
-
 NOINST_H_FILES =                       \
        ev-pixbuf-cache.h               \
        ev-timeline.h                   \
@@ -30,7 +15,7 @@ INST_H_FILES =                                \
        ev-view.h                       \
        ev-view-type-builtins.h
 
-headerdir = $(includedir)/evince/$(EV_API_VERSION)/ev-view
+headerdir = $(includedir)/evince/$(EV_API_VERSION)/libview
 header_DATA = $(INST_H_FILES)
 
 libevview_la_SOURCES =                         \
@@ -47,6 +32,28 @@ libevview_la_SOURCES =                       \
        $(NOINST_H_FILES)               \
        $(INST_H_FILES)
 
+libevview_la_CPPFLAGS = \
+       -DG_LOG_DOMAIN=\"EvView\"               \
+       -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+       -DEVINCE_COMPILATION                    \
+       -I$(top_srcdir)                         \
+       -I$(top_srcdir)/libdocument             \
+       -I$(top_builddir)                       \
+       $(AM_CPPFLAGS)
+
+libevview_la_CFLAGS = \
+       $(LIBVIEW_CFLAGS)       \
+       $(WARN_CFLAGS)          \
+       $(DISABLE_DEPRECATED)   \
+       $(AM_CFLAGS)
+
+libevview_la_LDFLAGS = \
+       -version-info $(EV_VIEW_LT_VERSION_INFO)        \
+       -export-symbols-regex "^ev_*"   \
+       $(AM_LDFLAGS)
+
+libevview_la_LIBADD = $(LIBVIEW_LIBS)
+
 BUILT_SOURCES =                        \
        ev-view-marshal.h               \
        ev-view-marshal.c               \
@@ -65,13 +72,13 @@ ev-view-marshal.c: $(srcdir)/ev-view-marshal.list
 ev-view-type-builtins.h: stamp-ev-view-type-builtins.h
        @true
 
-stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template ev-job-scheduler.h
+stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template $(INST_H_FILES)
        $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
        && (cmp -s xgen-etbh ev-view-type-builtins.h || cp xgen-etbh ev-view-type-builtins.h ) \
        && rm -f xgen-etbh \
        && echo timestamp > $(@F)
 
-ev-view-type-builtins.c: ev-view-type-builtins.c.template ev-job-scheduler.h
+ev-view-type-builtins.c: ev-view-type-builtins.c.template $(INST_H_FILES)
        $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
        && (cmp -s xgen-etbc ev-view-type-builtins.c || cp xgen-etbc ev-view-type-builtins.c ) \
        && rm -f xgen-etbc
@@ -80,4 +87,3 @@ EXTRA_DIST = \
        ev-view-type-builtins.c.template  \
        ev-view-type-builtins.h.template  \
        ev-view-marshal.list
-
index 66f9f80c5ddd2ec36791000d9c32a39db117d6fb..74a390af6d0fa379d501220e5cd72ed4ef909c8c 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-view.h> can be included directly."
+#endif
+
 #ifndef EV_JOB_SCHEDULER_H
 #define EV_JOB_SCHEDULER_H
 
index 5915a28ab1d0e8f013e83f67034fe9068fb9cea8..fc577c1ed807fad243f7d1dc65a88cd7e410ed2d 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-view.h> can be included directly."
+#endif
+
 #ifndef __EV_JOBS_H__
 #define __EV_JOBS_H__
 
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include "ev-document.h"
-#include "ev-selection.h"
-#include "ev-render-context.h"
+#include <evince-document.h>
 
 G_BEGIN_DECLS
 
index 43f455329c5a6d792189f8f9dc8f19b3be01bde2..814ede7aad2e3a02bd8887b1ab4535c17a3624e6 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-view.h> can be included directly."
+#endif
+
 #ifndef __EV_PAGE_CACHE_H__
 #define __EV_PAGE_CACHE_H__
 
 #include <gtk/gtk.h>
 
-#include "ev-document.h"
+#include <evince-document.h>
 
 G_BEGIN_DECLS
 #define EV_TYPE_PAGE_CACHE            (ev_page_cache_get_type ())
index 5e48f2845c10f848fa75ab7e2374b3c1fcbed491..a22634e6d5151a2cd349f3dc62d8d808d81ba0ed 100644 (file)
  * ev-view.c from exploding.
  */
 
+#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-view.h> can be included directly."
+#endif
+
 #ifndef __EV_PIXBUF_CACHE_H__
 #define __EV_PIXBUF_CACHE_H__
 
 #include <gtk/gtk.h>
 
-#include "ev-document.h"
-#include "ev-selection.h"
+#include <evince-document.h>
 
 G_BEGIN_DECLS
 
index 534e48ad49086f30c9cd73083be164e210c741e4..31c4f2658d6b31a6873074dcca9035b52914220d 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (EVINCE_COMPILATION)
+#error "This is a private header."
+#endif
+
 #ifndef __EV_TIMELINE_H__
 #define __EV_TIMELINE_H__
 
index 522caf28872210670d9c795eed962806134a2cb4..7cebfd31f112dc660285a678931195f257b4e0e2 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (EVINCE_COMPILATION)
+#error "This is a private header."
+#endif
+
 #ifndef __EV_TRANSITION_ANIMATION_H__
 #define __EV_TRANSITION_ANIMATION_H__
 
+#include <evince-document.h>
 #include "ev-timeline.h"
 #include "ev-transition-effect.h"
 
index c29c471a97f37550e4f2681138e4a33b5dfa769c..eee59ee2fda522187a807ba6ff930f8f4f59a6c5 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (EVINCE_COMPILATION)
+#error "This is a private header."
+#endif
+
 #ifndef __EV_VIEW_ACCESSIBLE_H__
 #define __EV_VIEW_ACCESSIBLE_H__
 
index c89444038f7f977bef73a3e7aae3086591f7998d..542607d1cb0f25b899d589e1099bbd6dd681bda8 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (EVINCE_COMPILATION)
+#error "This is a private header."
+#endif
+
 #ifndef __EV_VIEW_PRIVATE_H__
 #define __EV_VIEW_PRIVATE_H__
 
index 2365a44db457055f5c1bb05d6211cc007d571279..cbc22d69a388a2043da564c3f52a530e16ddd1ed 100644 (file)
@@ -1,4 +1,6 @@
 /*** BEGIN file-header ***/
+#include <config.h>
+
 #include "ev-view-type-builtins.h"
 
 /*** END file-header ***/
index a6ac309a73c7c4c60fd2f2148525d7e182b70605..c4ba4974159a244f80b2e31b85c02917653a5df3 100644 (file)
@@ -1,5 +1,9 @@
 /*** BEGIN file-header ***/
 
+#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-view.h> can be included directly."
+#endif
+
 #ifndef EV_VIEW_TYPE_BUILTINS_H
 #define EV_VIEW_TYPE_BUILTINS_H
 
index 31915452dc9cf04dad44745e4b3a07985812ee27..815571c9efba55eda26da7507311d21b005bbffc 100644 (file)
@@ -40,6 +40,7 @@
 #include "ev-view.h"
 #include "ev-view-accessible.h"
 #include "ev-view-private.h"
+#include "ev-view-type-builtins.h"
 
 #define EV_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass))
 #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW))
@@ -5831,22 +5832,6 @@ ev_view_previous_page (EvView *view)
                
 /*** Enum description for usage in signal ***/
 
-GType
-ev_sizing_mode_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { EV_SIZING_FIT_WIDTH, "EV_SIZING_FIT_WIDTH", "fit-width" },
-      { EV_SIZING_BEST_FIT, "EV_SIZING_BEST_FIT", "best-fit" },
-      { EV_SIZING_FREE, "EV_SIZING_FREE", "free" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("EvSizingMode", values);
-  }
-  return etype;
-}
-
 void
 ev_view_update_view_size (EvView *view, GtkScrolledWindow * scrolled_window)
 {
index af12bafe5952e916a9a33a695b5608af0ef0492b..0c9db0a2eeca16985b4a57c6bc9edbef2fd27e9b 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-view.h> can be included directly."
+#endif
+
 #ifndef __EV_VIEW_H__
 #define __EV_VIEW_H__
 
 #include <gtk/gtk.h>
 
-#include "ev-document.h"
-#include "ev-link.h"
+#include <evince-document.h>
 
 G_BEGIN_DECLS
 
@@ -31,9 +34,6 @@ G_BEGIN_DECLS
 #define EV_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_VIEW, EvView))
 #define EV_IS_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_VIEW))
 
-#define EV_TYPE_SIZING_MODE     (ev_sizing_mode_get_type())
-#define EV_SIZING_MODE_CLASS    (g_type_class_peek (EV_TYPE_SIZING_MODE))
-
 typedef struct _EvView       EvView;
 typedef struct _EvViewClass  EvViewClass;
 
@@ -50,7 +50,6 @@ typedef enum {
 } EvViewSelectionMode;
 
 GType          ev_view_get_type          (void) G_GNUC_CONST;
-GType           ev_sizing_mode_get_type   (void) G_GNUC_CONST;
 
 GtkWidget*     ev_view_new               (void);
 void           ev_view_set_document      (EvView         *view,
index 960a0a1a51b306f168944fae73c464426b631a65..33d831efa9388ebd3a8d839a36a91afb137e4fe2 100644 (file)
@@ -1,7 +1,8 @@
 INCLUDES=                                      \
        -DDATADIR=\"$(pkgdatadir)\"             \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
-       -I$(top_srcdir)/libdocument             \
+       -I$(top_srcdir)                         \
+       -I$(top_builddir)                       \
        $(FRONTEND_CFLAGS)                      \
        $(NAUTILUS_CFLAGS)                      \
        $(DISABLE_DEPRECATED)                   \
@@ -28,7 +29,7 @@ libevince_properties_page_la_SOURCES =        \
 
 libevince_properties_page_la_LIBADD =          \
        libevproperties.la                      \
-       $(top_builddir)/libdocument/libevbackend.la     \
+       $(top_builddir)/libdocument/libevdocument.la    \
        $(FRONTEND_LIBS)                        \
        $(NAUTILUS_LIBS)
 
index d7f88e2de1aa08fc198629ad6c20cbaefef51836..a3c045b43ff8df8323fdcec646d029efcd0216a8 100644 (file)
@@ -37,9 +37,8 @@
 #include <libnautilus-extension/nautilus-extension-types.h>
 #include <libnautilus-extension/nautilus-property-page-provider.h>
 
+#include <evince-document.h>
 #include "ev-properties-view.h"
-#include "ev-backends-manager.h"
-#include "ev-document-factory.h"
 
 static GType epp_type = 0;
 static void property_page_provider_iface_init
index ec4dac7bfccc5a51178dae34925470e49d1f31b1..65a237b6ca9e5a3d4e26b054b43fe2497b417122 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <gtk/gtk.h>
 
-#include "ev-document-info.h"
+#include <evince-document.h>
 
 G_BEGIN_DECLS
 
index ab09ef9b3bd0891ce1066ab03e08f741eacf05eb..4230dbb80cdeae7b993fa670a4a2837035d67d73 100644 (file)
@@ -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)
 
index 6d501daa5f98891ed9e8437b4f480e8e3db9daba..523a8c6aa164342bde35b792b2512eb5f026ef21 100644 (file)
@@ -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",
index 19c2bee0db96c3cd3d3a6331a2abf9defd06ea7f..c7b3c85ca77614e2ffd6dcd3974c33b7d61c9e30 100644 (file)
@@ -1,21 +1,26 @@
 @INTLTOOL_SCHEMAS_RULE@
 
-INCLUDES=                                      \
+bin_PROGRAMS = evince-thumbnailer
+
+evince_thumbnailer_SOURCES = \
+       evince-thumbnailer.c
+
+evince_thumbnailer_CPPFLAGS = \
        -DDATADIR=\"$(pkgdatadir)\"             \
-       -I$(top_srcdir)/libdocument             \
+       -I$(top_srcdir)                         \
+       -I$(top_builddir)                       \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
-       $(FRONTEND_CFLAGS)                      \
-       $(DISABLE_DEPRECATED)                   \
-       $(WARN_CFLAGS)
+       $(AM_CPPFLAGS)
 
-bin_PROGRAMS=evince-thumbnailer
-
-evince_thumbnailer_SOURCES=    \
-       evince-thumbnailer.c
+evince_thumbnailer_CFLAGS = \
+       $(FRONTEND_CFLAGS)      \
+       $(DISABLE_DEPRECATED)   \
+       $(WARN_CFLAGS)          \
+       $(AM_CFLAGS)
 
-evince_thumbnailer_LDADD=              \
-       $(top_builddir)/libdocument/libevbackend.la     \
+evince_thumbnailer_LDADD = \
+       $(top_builddir)/libdocument/libevdocument.la    \
        $(FRONTEND_LIBS)
 
 schema_files = \
index b3c8285ee3d83debba1e41578b18f0f4a7a21124..ec72f16eea86d5ff09f14c916e5105397ab01a7c 100644 (file)
 
 #include <config.h>
 
-#include <ev-document.h>
-#include <ev-document-thumbnails.h>
-#include <ev-async-renderer.h>
-#include <ev-document-factory.h>
-#include <ev-backends-manager.h>
+#include <evince-document.h>
 
 #include <gio/gio.h>