diff options
author | rootavish <[email protected]> | 2014-09-22 22:40:52 +0530 |
---|---|---|
committer | rootavish <[email protected]> | 2014-09-22 22:40:52 +0530 |
commit | a022a290b92a27975d5d3a526003fcdb9db1212f (patch) | |
tree | 1224440382ffe27fbdcd0a8ae2f17d5bdd84724f /libview | |
parent | 5ac452a8a78841bf88dee6e7b0a9ea421299f669 (diff) | |
download | atril-a022a290b92a27975d5d3a526003fcdb9db1212f.tar.bz2 atril-a022a290b92a27975d5d3a526003fcdb9db1212f.tar.xz |
Can build with epub disabled
Added the required preprocessor directives to make building without epub support possible.
Diffstat (limited to 'libview')
-rw-r--r-- | libview/ev-jobs.c | 10 | ||||
-rw-r--r-- | libview/ev-web-view.c | 5 | ||||
-rw-r--r-- | libview/ev-web-view.h | 3 |
3 files changed, 13 insertions, 5 deletions
diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c index 3590d822..4a352521 100644 --- a/libview/ev-jobs.c +++ b/libview/ev-jobs.c @@ -41,7 +41,7 @@ #include "ev-debug.h" #include <gtk/gtk.h> -#ifdef ENABLE_EPUB +#if ENABLE_EPUB #if GTK_CHECK_VERSION(3, 0, 0) #include <webkit2/webkit2.h> #else @@ -790,6 +790,7 @@ ev_job_thumbnail_dispose (GObject *object) (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object); } +#if ENABLE_EPUB #if !GTK_CHECK_VERSION(3, 0, 0) static gboolean web_thumbnail_get_screenshot_cb(EvJobThumbnail *job_thumb) @@ -860,7 +861,7 @@ web_thumbnail_get_screenshot_cb (WebKitWebView *webview, g_object_ref(job_thumb)); } #endif - +#endif static gboolean ev_job_thumbnail_run (EvJob *job) { @@ -888,6 +889,7 @@ ev_job_thumbnail_run (EvJob *job) } g_object_unref (page); +#if ENABLE_EPUB if (job->document->iswebdocument == TRUE) { if (!webview) { webview = webkit_web_view_new(); @@ -916,7 +918,9 @@ ev_job_thumbnail_run (EvJob *job) #endif } - else { + else +#endif + { job_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (job->document), rc, TRUE); ev_document_doc_mutex_unlock (); diff --git a/libview/ev-web-view.c b/libview/ev-web-view.c index b42da163..9bd2e512 100644 --- a/libview/ev-web-view.c +++ b/libview/ev-web-view.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if ENABLE_EPUB #include "config.h" #include <glib/gi18n-lib.h> @@ -870,4 +870,5 @@ ev_web_view_disconnect_handlers(EvWebView *webview) g_signal_handlers_disconnect_by_func(webview->model, ev_web_view_page_changed_cb, webview); -}
\ No newline at end of file +} +#endif
\ No newline at end of file diff --git a/libview/ev-web-view.h b/libview/ev-web-view.h index 74b7eb6b..29a22f06 100644 --- a/libview/ev-web-view.h +++ b/libview/ev-web-view.h @@ -22,6 +22,8 @@ #error "Only <atril-web_view.h> can be included directly." #endif +#include "config.h" +#if ENABLE_EPUB #ifndef __EV_WEB_VIEW_H__ #define __EV_WEB_VIEW_H__ @@ -87,3 +89,4 @@ void ev_web_view_disconnect_handlers (EvWebView *webview); G_END_DECLS #endif /* __EV_WEB_VIEW_H__ */ +#endif /* ENABLE_EPUB */
\ No newline at end of file |