diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-12-16 23:37:43 (GMT) |
---|---|---|
committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2009-12-19 10:12:02 (GMT) |
commit | 1e68c1dd8988f17d45abe744e7beeeb90c997ed2 (patch) | |
tree | d07afeeb92c5a7d0aa56f9b723b294a7fd91a741 | |
parent | 07545e46f1142614227a8f2a98a51009925184df (diff) |
Move EvPrintOperation to libview
https://bugzilla.gnome.org/show_bug.cgi?id=604750
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | evince-view.h | 1 | ||||
-rw-r--r-- | libview/Makefile.am | 2 | ||||
-rw-r--r-- | libview/ev-print-operation.c (renamed from shell/ev-print-operation.c) | 4 | ||||
-rw-r--r-- | libview/ev-print-operation.h (renamed from shell/ev-print-operation.h) | 6 | ||||
-rw-r--r-- | shell/Makefile.am | 2 |
6 files changed, 12 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index fc05dbc..6d9a8f9 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 4c83d47..9d1c094 100644 --- a/evince-view.h +++ b/evince-view.h @@ -24,6 +24,7 @@ #include <libview/ev-job-scheduler.h> #include <libview/ev-jobs.h> #include <libview/ev-document-model.h> +#include <libview/ev-print-operation.h> #include <libview/ev-view.h> #include <libview/ev-view-type-builtins.h> #include <libview/ev-stock-icons.h> diff --git a/libview/Makefile.am b/libview/Makefile.am index 03b8d6d..e26e82e 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 index 8d4df9f..aaf9f5b 100644 --- a/shell/ev-print-operation.c +++ b/libview/ev-print-operation.c @@ -28,12 +28,8 @@ #include <glib/gstdio.h> #include <unistd.h> -#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 index 06a2845..2ed3b83 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 <evince-view.h> can be included directly." +#endif + #ifndef __EV_PRINT_OPERATION_H__ #define __EV_PRINT_OPERATION_H__ #include <gtk/gtk.h> #include <glib-object.h> -#include "ev-document.h" +#include <evince-document.h> G_BEGIN_DECLS diff --git a/shell/Makefile.am b/shell/Makefile.am index 2eff97f..709289a 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 \ |