GNOME.org
 

evince r3348 - in trunk: . libdocument libview shell

Author: carlosgc
Date: Sun Jan 18 11:53:54 2009
New Revision: 3348
URL: http://svn.gnome.org/viewvc/evince?rev=3348&view=rev

Log:
2009-01-18  Carlos Garcia Campos  <carlosgc gnome org>

	* configure.ac:
	* Makefile.am:
	* libdocument/Makefile.am:
	* libview/Makefile.am:
	* libview/ev-job-scheduler.[ch]:
	* libview/ev-jobs.[ch]:
	* libview/ev-page-cache.[ch]:
	* libview/ev-pixbuf-cache.[ch]:
	* libview/ev-timeline.[ch]:
	* libview/ev-transition-animation.[ch]:
	* libview/ev-view-accessible.[ch]:
	* libview/ev-view-marshal.list:
	* libview/ev-view.[ch]:
	* shell/Makefile.am:

	Move EvView specific code to a libeviview library so that it can
	be embbeded in other applications. Based on patches by Tomeu
	Vizoso. Fixes bug #567751.

Added:
   trunk/libview/
   trunk/libview/Makefile.am
   trunk/libview/ev-job-scheduler.c
      - copied, changed from r3347, /trunk/shell/ev-job-scheduler.c
   trunk/libview/ev-job-scheduler.h
      - copied, changed from r3347, /trunk/shell/ev-job-scheduler.h
   trunk/libview/ev-jobs.c
      - copied, changed from r3347, /trunk/shell/ev-jobs.c
   trunk/libview/ev-jobs.h
      - copied, changed from r3347, /trunk/shell/ev-jobs.h
   trunk/libview/ev-page-cache.c
      - copied, changed from r3347, /trunk/shell/ev-page-cache.c
   trunk/libview/ev-page-cache.h
      - copied, changed from r3347, /trunk/shell/ev-page-cache.h
   trunk/libview/ev-pixbuf-cache.c
      - copied, changed from r3347, /trunk/shell/ev-pixbuf-cache.c
   trunk/libview/ev-pixbuf-cache.h
      - copied, changed from r3347, /trunk/shell/ev-pixbuf-cache.h
   trunk/libview/ev-timeline.c
      - copied, changed from r3347, /trunk/shell/ev-timeline.c
   trunk/libview/ev-timeline.h
      - copied, changed from r3347, /trunk/shell/ev-timeline.h
   trunk/libview/ev-transition-animation.c
      - copied, changed from r3347, /trunk/shell/ev-transition-animation.c
   trunk/libview/ev-transition-animation.h
      - copied, changed from r3347, /trunk/shell/ev-transition-animation.h
   trunk/libview/ev-view-accessible.c
      - copied, changed from r3347, /trunk/shell/ev-view-accessible.c
   trunk/libview/ev-view-accessible.h
      - copied, changed from r3347, /trunk/shell/ev-view-accessible.h
   trunk/libview/ev-view-marshal.list
   trunk/libview/ev-view-private.h
      - copied, changed from r3347, /trunk/shell/ev-view-private.h
   trunk/libview/ev-view.c
      - copied, changed from r3347, /trunk/shell/ev-view.c
   trunk/libview/ev-view.h
      - copied, changed from r3347, /trunk/shell/ev-view.h
Removed:
   trunk/shell/ev-job-scheduler.c
   trunk/shell/ev-job-scheduler.h
   trunk/shell/ev-jobs.c
   trunk/shell/ev-jobs.h
   trunk/shell/ev-page-cache.c
   trunk/shell/ev-page-cache.h
   trunk/shell/ev-pixbuf-cache.c
   trunk/shell/ev-pixbuf-cache.h
   trunk/shell/ev-timeline.c
   trunk/shell/ev-timeline.h
   trunk/shell/ev-transition-animation.c
   trunk/shell/ev-transition-animation.h
   trunk/shell/ev-view-accessible.c
   trunk/shell/ev-view-accessible.h
   trunk/shell/ev-view-private.h
   trunk/shell/ev-view.c
   trunk/shell/ev-view.h
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/libdocument/Makefile.am
   trunk/shell/Makefile.am
   trunk/shell/ev-marshal.list

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Jan 18 11:53:54 2009
@@ -3,6 +3,7 @@
 	data \
 	libdocument \
 	backend \
+	libview \
 	properties \
 	shell \
 	po \

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jan 18 11:53:54 2009
@@ -4,7 +4,7 @@
 AC_INIT([Evince],[2.25.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
 
-EV_API_VERSION=2.20
+EV_API_VERSION=2.25
 AC_SUBST(EV_API_VERSION)
 
 AM_CONFIG_HEADER(config.h)
@@ -53,6 +53,7 @@
 LIBXML_REQUIRED=2.5.0
 
 PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(LIBVIEW, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED)
 PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0 gconf-2.0)
@@ -133,6 +134,11 @@
 AC_SUBST(LIB_CFLAGS)
 AC_SUBST(LIB_LIBS)
 
+LIBVIEW_CFLAGS="$LIBVIEW_CFLAGS $DEBUG_FLAGS"
+LIBVIEW_LIBS="$LIBVIEW_LIBS"
+AC_SUBST(LIBVIEW_CFLAGS)
+AC_SUBST(LIBVIEW_LIBS)
+
 BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
 AC_SUBST(BACKEND_CFLAGS)
 AC_SUBST(BACKEND_LIBS)
@@ -449,6 +455,7 @@
 help/reference/Makefile
 help/reference/version.xml
 libdocument/Makefile
+libview/Makefile
 Makefile
 po/Makefile.in
 properties/Makefile

Modified: trunk/libdocument/Makefile.am
==============================================================================
--- trunk/libdocument/Makefile.am	(original)
+++ trunk/libdocument/Makefile.am	Sun Jan 18 11:53:54 2009
@@ -46,7 +46,7 @@
 	ev-selection.h				\
 	ev-transition-effect.h
 
-headerdir = $(prefix)/include/evince- EV_API_VERSION@/evince
+headerdir = $(prefix)/include/evince/@EV_API_VERSION@/ev-backend
 header_DATA = $(INST_H_FILES)
 
 libevbackend_la_SOURCES=			\

Added: trunk/libview/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/libview/Makefile.am	Sun Jan 18 11:53:54 2009
@@ -0,0 +1,56 @@
+INCLUDES=					\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
+	-I$(top_srcdir)/libdocument		\
+	$(LIBVIEW_CFLAGS)			\
+	$(WARN_CFLAGS)				\
+	$(DISABLE_DEPRECATED)
+
+lib_LTLIBRARIES = libevview.la
+
+libevview_la_LDFLAGS = -export-dynamic
+libevview_la_LIBADD = $(LIBVIEW_LIBS)
+
+NOINST_H_FILES =			\
+	ev-job-scheduler.h		\
+	ev-pixbuf-cache.h		\
+	ev-timeline.h			\
+	ev-transition-animation.h	\
+	ev-view-accessible.h		\
+	ev-view-marshal.h		\
+	ev-view-private.h
+
+INST_H_FILES = 				\
+	ev-jobs.h			\
+	ev-page-cache.h			\
+	ev-view.h
+
+headerdir = $(prefix)/include/evince/@EV_API_VERSION@/ev-view
+header_DATA = $(INST_H_FILES)
+
+libevview_la_SOURCES = 			\
+	ev-jobs.c			\
+	ev-job-scheduler.c		\
+	ev-page-cache.c			\
+	ev-pixbuf-cache.c		\
+	ev-timeline.c			\
+	ev-transition-animation.c	\
+	ev-view.c			\
+	ev-view-accessible.c		\
+	ev-view-marshal.c		\
+	$(NOINST_H_FILES)		\
+	$(INST_H_FILES)
+
+BUILT_SOURCES = 			\
+	ev-view-marshal.h		\
+	ev-view-marshal.c
+
+CLEANFILES = $(BUILT_SOURCES)
+
+ev-view-marshal.h: $(srcdir)/ev-view-marshal.list
+	$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header > $@
+
+ev-view-marshal.c: $(srcdir)/ev-view-marshal.list
+	echo '#include "ev-view-marshal.h"' > ev-view-marshal.c
+	$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --body >> $@
+
+EXTRA_DIST = ev-view-marshal.list

Copied: trunk/libview/ev-job-scheduler.c (from r3347, /trunk/shell/ev-job-scheduler.c)
==============================================================================

Copied: trunk/libview/ev-job-scheduler.h (from r3347, /trunk/shell/ev-job-scheduler.h)
==============================================================================

Copied: trunk/libview/ev-jobs.c (from r3347, /trunk/shell/ev-jobs.c)
==============================================================================

Copied: trunk/libview/ev-jobs.h (from r3347, /trunk/shell/ev-jobs.h)
==============================================================================

Copied: trunk/libview/ev-page-cache.c (from r3347, /trunk/shell/ev-page-cache.c)
==============================================================================

Copied: trunk/libview/ev-page-cache.h (from r3347, /trunk/shell/ev-page-cache.h)
==============================================================================

Copied: trunk/libview/ev-pixbuf-cache.c (from r3347, /trunk/shell/ev-pixbuf-cache.c)
==============================================================================
--- /trunk/shell/ev-pixbuf-cache.c	(original)
+++ trunk/libview/ev-pixbuf-cache.c	Sun Jan 18 11:53:54 2009
@@ -4,6 +4,7 @@
 #include "ev-page-cache.h"
 #include "ev-document-images.h"
 #include "ev-document-forms.h"
+#include "ev-document-links.h"
 #include "ev-image.h"
 #include "ev-form-field.h"
 

Copied: trunk/libview/ev-pixbuf-cache.h (from r3347, /trunk/shell/ev-pixbuf-cache.h)
==============================================================================

Copied: trunk/libview/ev-timeline.c (from r3347, /trunk/shell/ev-timeline.c)
==============================================================================

Copied: trunk/libview/ev-timeline.h (from r3347, /trunk/shell/ev-timeline.h)
==============================================================================

Copied: trunk/libview/ev-transition-animation.c (from r3347, /trunk/shell/ev-transition-animation.c)
==============================================================================

Copied: trunk/libview/ev-transition-animation.h (from r3347, /trunk/shell/ev-transition-animation.h)
==============================================================================

Copied: trunk/libview/ev-view-accessible.c (from r3347, /trunk/shell/ev-view-accessible.c)
==============================================================================

Copied: trunk/libview/ev-view-accessible.h (from r3347, /trunk/shell/ev-view-accessible.h)
==============================================================================

Added: trunk/libview/ev-view-marshal.list
==============================================================================
--- (empty file)
+++ trunk/libview/ev-view-marshal.list	Sun Jan 18 11:53:54 2009
@@ -0,0 +1 @@
+VOID:ENUM,BOOLEAN

Copied: trunk/libview/ev-view-private.h (from r3347, /trunk/shell/ev-view-private.h)
==============================================================================

Copied: trunk/libview/ev-view.c (from r3347, /trunk/shell/ev-view.c)
==============================================================================
--- /trunk/shell/ev-view.c	(original)
+++ trunk/libview/ev-view.c	Sun Jan 18 11:53:54 2009
@@ -33,12 +33,12 @@
 #include "ev-document-links.h"
 #include "ev-document-misc.h"
 #include "ev-document-transition.h"
-#include "ev-marshal.h"
 #include "ev-page-cache.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-transition-animation.h"
-#include "ev-utils.h"
+#include "ev-view-marshal.h"
 #include "ev-view.h"
+#include "ev-view-accessible.h"
 #include "ev-view-private.h"
 
 #define EV_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass))
@@ -3953,7 +3953,7 @@
 		         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		         G_STRUCT_OFFSET (EvViewClass, binding_activated),
 		         NULL, NULL,
-		         ev_marshal_VOID__ENUM_BOOLEAN,
+		         ev_view_marshal_VOID__ENUM_BOOLEAN,
 		         G_TYPE_NONE, 2,
 		         GTK_TYPE_SCROLL_TYPE,
 		         G_TYPE_BOOLEAN);
@@ -3963,7 +3963,7 @@
 		         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		         G_STRUCT_OFFSET (EvViewClass, zoom_invalid),
 		         NULL, NULL,
-		         ev_marshal_VOID__VOID,
+		         g_cclosure_marshal_VOID__VOID,
 		         G_TYPE_NONE, 0, G_TYPE_NONE);
 	signals[SIGNAL_HANDLE_LINK] = g_signal_new ("handle-link",
 	  	         G_TYPE_FROM_CLASS (object_class),

Copied: trunk/libview/ev-view.h (from r3347, /trunk/shell/ev-view.h)
==============================================================================
--- /trunk/shell/ev-view.h	(original)
+++ trunk/libview/ev-view.h	Sun Jan 18 11:53:54 2009
@@ -24,7 +24,6 @@
 
 #include "ev-document.h"
 #include "ev-link.h"
-#include "ev-view-accessible.h"
 
 G_BEGIN_DECLS
 

Modified: trunk/shell/Makefile.am
==============================================================================
--- trunk/shell/Makefile.am	(original)
+++ trunk/shell/Makefile.am	Sun Jan 18 11:53:54 2009
@@ -9,6 +9,7 @@
 	-I$(top_srcdir)/cut-n-paste/evmountoperation/		\
 	-I$(top_srcdir)/cut-n-paste/smclient/			\
 	-I$(top_srcdir)/libdocument				\
+	-I$(top_srcdir)/libview					\
 	-I$(top_srcdir)/properties				\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
@@ -30,10 +31,6 @@
 	eggfindbar.h			\
 	ev-application.c		\
 	ev-application.h		\
-	ev-job-scheduler.h		\
-	ev-job-scheduler.c		\
-	ev-jobs.h			\
-	ev-jobs.c			\
 	ev-file-monitor.h		\
 	ev-file-monitor.c		\
 	ev-history.c			\
@@ -55,12 +52,8 @@
 	ev-page-action.h		\
 	ev-page-action-widget.c		\
 	ev-page-action-widget.h		\
-	ev-page-cache.h			\
-	ev-page-cache.c			\
 	ev-password-view.h		\
 	ev-password-view.c		\
-	ev-pixbuf-cache.c		\
-	ev-pixbuf-cache.h		\
 	ev-print-operation.h		\
 	ev-print-operation.c		\
 	ev-progress-message-area.h	\
@@ -73,11 +66,6 @@
 	ev-open-recent-action.h		\
 	ev-utils.c			\
 	ev-utils.h			\
-	ev-view-accessible.c		\
-	ev-view-accessible.h		\
-	ev-view-private.h		\
-	ev-view.c			\
-	ev-view.h			\
 	ev-window.c			\
 	ev-window.h			\
 	ev-window-title.c		\
@@ -96,10 +84,6 @@
 	ev-sidebar-thumbnails.h		\
 	ev-stock-icons.c		\
 	ev-stock-icons.h		\
-	ev-timeline.c			\
-	ev-timeline.h			\
-	ev-transition-animation.c	\
-	ev-transition-animation.h	\
 	main.c
 
 evince_LDADD=										\
@@ -112,6 +96,7 @@
 	$(top_builddir)/cut-n-paste/smclient/libsmclient.la				\
 	$(top_builddir)/properties/libevproperties.la					\
 	$(top_builddir)/libdocument/libevbackend.la					\
+	$(top_builddir)/libview/libevview.la						\
 	$(SHELL_LIBS)
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c

Modified: trunk/shell/ev-marshal.list
==============================================================================
--- trunk/shell/ev-marshal.list	(original)
+++ trunk/shell/ev-marshal.list	Sun Jan 18 11:53:54 2009
@@ -1,4 +1 @@
-VOID:NONE
-VOID:OBJECT,OBJECT
-VOID:ENUM,BOOLEAN
 VOID:STRING,STRING
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]