Move EvPrintOperation to libview

https://bugzilla.gnome.org/show_bug.cgi?id=604750

diff --git a/configure.ac b/configure.ac
index fc05dbca2de4aeca02ae52a88821357ff5da0cf7..6d9a8f9b97e478a0bfbea44debefa46038e09b46 100644 (file)
--- 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 4c83d471b7de0e54c60c6af9251abd3c6a71db5d..9d1c09416e97cf02da170850a98397eecba924c3 100644 (file)
--- 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 03b8d6d0fc09ae4d69aa868b37524e1519b035db..e26e82ed96612b5f7d8e4d619396572f9d939fc6 100644 (file)
--- 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 8d4df9f81dd41cfeed5fa84a6cd486293c5f1785..aaf9f5bfa56499b8d70238fc99a21722ea6b3e53 100644 (file)
--- 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
similarity index 95%
rename from shell/ev-print-operation.h
rename to libview/ev-print-operation.h
index 06a2845ff6d72b8d884c93b33214cbe2d6496fc6..2ed3b837d1a0c05a7d27a126afce2af8fa7ed493 100644 (file)
--- 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 2eff97f442f3ec7f4b4019d488ef524805c8fedb..709289a58cc40434c137facdc4d2b4c4351a9fee 100644 (file)
--- 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          \