From: Tomeu Vizoso Date: Wed, 16 Dec 2009 23:37:43 +0000 (-0200) Subject: Move EvPrintOperation to libview X-Git-Tag: EVINCE_2_29_4~11 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=1e68c1dd8988f17d45abe744e7beeeb90c997ed2;p=evince.git Move EvPrintOperation to libview https://bugzilla.gnome.org/show_bug.cgi?id=604750 --- diff --git a/configure.ac b/configure.ac index fc05dbca..6d9a8f9b 100644 --- a/configure.ac +++ b/configure.ac @@ -337,8 +337,8 @@ LIBDOCUMENT_LIBS="$LIBDOCUMENT_LIBS" AC_SUBST(LIBDOCUMENT_CFLAGS) AC_SUBST(LIBDOCUMENT_LIBS) -LIBVIEW_CFLAGS="$LIBVIEW_CFLAGS $DEBUG_FLAGS" -LIBVIEW_LIBS="$LIBVIEW_LIBS" +LIBVIEW_CFLAGS="$LIBVIEW_CFLAGS $GTKUNIXPRINT_CFLAGS $DEBUG_FLAGS" +LIBVIEW_LIBS="$LIBVIEW_LIBS $GTKUNIXPRINT_LIBS" AC_SUBST(LIBVIEW_CFLAGS) AC_SUBST(LIBVIEW_LIBS) @@ -346,8 +346,8 @@ BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG AC_SUBST(BACKEND_CFLAGS) AC_SUBST(BACKEND_LIBS) -SHELL_CFLAGS="$SHELL_CORE_CFLAGS $GTKUNIXPRINT_CFLAGS $DBUS_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS" -SHELL_LIBS="$SHELL_CORE_LIBS $GTKUNIXPRINT_CFLAGS $DBUS_LIBS $KEYRING_LIBS $GCONF_LIBS -lz" +SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS" +SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $KEYRING_LIBS $GCONF_LIBS -lz" AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) diff --git a/evince-view.h b/evince-view.h index 4c83d471..9d1c0941 100644 --- a/evince-view.h +++ b/evince-view.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/libview/Makefile.am b/libview/Makefile.am index 03b8d6d0..e26e82ed 100644 --- a/libview/Makefile.am +++ b/libview/Makefile.am @@ -14,6 +14,7 @@ INST_H_FILES = \ ev-document-model.h \ ev-jobs.h \ ev-job-scheduler.h \ + ev-print-operation.h \ ev-stock-icons.h \ ev-view.h \ ev-view-type-builtins.h @@ -28,6 +29,7 @@ libevview_la_SOURCES = \ ev-job-scheduler.c \ ev-page-cache.c \ ev-pixbuf-cache.c \ + ev-print-operation.c \ ev-stock-icons.c \ ev-timeline.c \ ev-transition-animation.c \ diff --git a/shell/ev-print-operation.c b/libview/ev-print-operation.c similarity index 99% rename from shell/ev-print-operation.c rename to libview/ev-print-operation.c index 8d4df9f8..aaf9f5bf 100644 --- a/shell/ev-print-operation.c +++ b/libview/ev-print-operation.c @@ -28,12 +28,8 @@ #include #include -#include "ev-file-exporter.h" #include "ev-jobs.h" #include "ev-job-scheduler.h" -#include "ev-application.h" -#include "ev-file-helpers.h" -#include "ev-document-print.h" enum { PROP_0, diff --git a/shell/ev-print-operation.h b/libview/ev-print-operation.h similarity index 95% rename from shell/ev-print-operation.h rename to libview/ev-print-operation.h index 06a2845f..2ed3b837 100644 --- a/shell/ev-print-operation.h +++ b/libview/ev-print-operation.h @@ -17,13 +17,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __EV_PRINT_OPERATION_H__ #define __EV_PRINT_OPERATION_H__ #include #include -#include "ev-document.h" +#include G_BEGIN_DECLS diff --git a/shell/Makefile.am b/shell/Makefile.am index 2eff97f4..709289a5 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -62,8 +62,6 @@ evince_SOURCES= \ ev-navigation-action-widget.h \ ev-password-view.h \ ev-password-view.c \ - ev-print-operation.h \ - ev-print-operation.c \ ev-progress-message-area.h \ ev-progress-message-area.c \ ev-properties-dialog.c \