summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac25
-rw-r--r--cut-n-paste/smclient/eggsmclient-xsmp.c2
-rw-r--r--libdocument/ev-document-misc.c4
-rw-r--r--libview/ev-view.c2
-rw-r--r--libview/ev-web-view.c22
-rw-r--r--shell/ev-sidebar-bookmarks.c2
6 files changed, 28 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index 6c43f14f..47d082a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -581,26 +581,25 @@ if test "x$enable_epub" = "xyes"; then
case "$with_gtk" in
2.0)
PKG_CHECK_MODULES(EPUB, webkit-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
- libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no)
- ;;
+ libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no)
+ ;;
3.0)
PKG_CHECK_MODULES(EPUB, webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
- libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no)
+ libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no)
if test "x$have_webkit" = "xno"; then
- AC_MSG_NOTICE([Webkit2 4.0 not found, trying 3.0])
+ AC_MSG_NOTICE([Webkit2 4.0 not found, trying 3.0])
WEBKIT_API_VERSION=3.0
PKG_CHECK_MODULES(EPUB, webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
- libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no)
+ libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no)
fi
- ;;
-esac
-
+ ;;
+ esac
- if test "x$have_webkit" = "xyes"; then
- AC_DEFINE([ENABLE_EPUB], [1], [Enable support for ePub documents.])
- else
- AC_MSG_WARN(["ePub support is disabled."])
- fi
+ if test "x$have_webkit" = "xyes"; then
+ AC_DEFINE([ENABLE_EPUB], [1], [Enable support for ePub documents.])
+ else
+ AC_MSG_WARN(["ePub support is disabled."])
+ fi
fi
AM_CONDITIONAL(ENABLE_EPUB, test x$have_webkit = xyes)
diff --git a/cut-n-paste/smclient/eggsmclient-xsmp.c b/cut-n-paste/smclient/eggsmclient-xsmp.c
index f31acae7..cf30f932 100644
--- a/cut-n-paste/smclient/eggsmclient-xsmp.c
+++ b/cut-n-paste/smclient/eggsmclient-xsmp.c
@@ -568,7 +568,7 @@ idle_do_pending_events (gpointer data)
do_save_yourself (xsmp);
}
- out:
+out:
#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_leave ();
#endif
diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c
index 01573601..6f760270 100644
--- a/libdocument/ev-document-misc.c
+++ b/libdocument/ev-document-misc.c
@@ -433,7 +433,7 @@ ev_document_misc_get_pointer_position (GtkWidget *widget,
gint *y)
{
#if GTK_CHECK_VERSION (3, 20, 0)
- GdkSeat *seat;
+ GdkSeat *seat;
#else
GdkDeviceManager *device_manager;
#endif
@@ -448,7 +448,7 @@ ev_document_misc_get_pointer_position (GtkWidget *widget,
if (!gtk_widget_get_realized (widget))
return;
-#if GTK_CHECK_VERSION(3, 20, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
seat = gdk_display_get_default_seat (gtk_widget_get_display (widget));
device_pointer = gdk_seat_get_pointer (seat);
#else
diff --git a/libview/ev-view.c b/libview/ev-view.c
index 42c51184..4b503d4a 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -5110,7 +5110,7 @@ ev_view_class_init (EvViewClass *class)
object_class->dispose = ev_view_dispose;
-#if GTK_CHECK_VERSION(3, 20, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_widget_class_set_css_name (widget_class, "evview");
#endif
diff --git a/libview/ev-web-view.c b/libview/ev-web-view.c
index 40e525ea..c995c4f4 100644
--- a/libview/ev-web-view.c
+++ b/libview/ev-web-view.c
@@ -219,14 +219,14 @@ ev_web_view_new (void)
webview = g_object_new (EV_TYPE_WEB_VIEW, NULL);
- #if GTK_CHECK_VERSION (3, 0, 0)
- EV_WEB_VIEW(webview)->findcontroller = webkit_web_view_get_find_controller (WEBKIT_WEB_VIEW(webview));
- EV_WEB_VIEW(webview)->findoptions = webkit_find_controller_get_options (EV_WEB_VIEW(webview)->findcontroller);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ EV_WEB_VIEW(webview)->findcontroller = webkit_web_view_get_find_controller (WEBKIT_WEB_VIEW(webview));
+ EV_WEB_VIEW(webview)->findoptions = webkit_find_controller_get_options (EV_WEB_VIEW(webview)->findcontroller);
- EV_WEB_VIEW(webview)->zoom_level = 1.0;
+ EV_WEB_VIEW(webview)->zoom_level = 1.0;
- EV_WEB_VIEW(webview)->findoptions |= WEBKIT_FIND_OPTIONS_NONE;
- #endif
+ EV_WEB_VIEW(webview)->findoptions |= WEBKIT_FIND_OPTIONS_NONE;
+#endif
return webview;
}
@@ -501,7 +501,7 @@ jump_to_find_results(EvWebView *webview,
gpointer data)
#endif
{
- #if !GTK_CHECK_VERSION (3, 0, 0)
+#if !GTK_CHECK_VERSION (3, 0, 0)
gint n_results;
gboolean forward ;
gboolean wrap ;
@@ -743,12 +743,12 @@ ev_web_view_set_handler(EvWebView *webview,gboolean visible)
#if GTK_CHECK_VERSION (3, 0, 0)
"load-changed",
#else
- "notify::load-status",
+ "notify::load-status",
#endif
- G_CALLBACK(jump_to_find_results),
- NULL);
+ G_CALLBACK(jump_to_find_results),
+ NULL);
#if GTK_CHECK_VERSION (3, 0, 0)
- g_signal_connect(webview->findcontroller,
+ g_signal_connect(webview->findcontroller,
"counted-matches",
G_CALLBACK(results_counted_cb),
webview);
diff --git a/shell/ev-sidebar-bookmarks.c b/shell/ev-sidebar-bookmarks.c
index 916985bb..4f2c237f 100644
--- a/shell/ev-sidebar-bookmarks.c
+++ b/shell/ev-sidebar-bookmarks.c
@@ -478,7 +478,7 @@ ev_sidebar_bookmarks_init (EvSidebarBookmarks *sidebar_bookmarks)
#if GTK_CHECK_VERSION (3, 0, 0)
hbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
#else
- hbox = gtk_hbutton_box_new ();
+ hbox = gtk_hbutton_box_new ();
#endif
priv->add_button = gtk_button_new_from_stock (GTK_STOCK_ADD);