Commit 2d1b3ddf authored by Sven Neumann's avatar Sven Neumann

help-browser: removed obsolete check for zoom API

Removed the check for the webkit zoom API and compile the respective
code unconditionally.
parent 2f4e3b23
......@@ -1257,15 +1257,6 @@ else
have_webkit="no (WebKit support disabled)"
fi
if test "x$have_webkit" = xyes; then
gimp_save_LIBS=$LIBS
LIBS="$LIBS $WEBKIT_LIBS"
AC_CHECK_LIB(webkit-1.0, webkit_web_view_set_zoom_level,
[AC_DEFINE(HAVE_WEBKIT_ZOOM_API, 1,
[Define to 1 if webkit has zoom API])])
LIBS=$gimp_save_LIBS
fi
AM_CONDITIONAL(BUILD_HELP_BROWSER, test "x$have_webkit" = xyes)
......
......@@ -300,9 +300,7 @@ browser_dialog_open (const gchar *plug_in_binary)
G_CALLBACK (view_key_press),
NULL);
#if HAVE_WEBKIT_ZOOM_API
webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (view), data.zoom);
#endif
g_signal_connect (view, "title-changed",
G_CALLBACK (title_changed),
......@@ -704,11 +702,9 @@ ui_manager_new (GtkWidget *window)
" <separator />"
" <menuitem action=\"find\" />"
" <menuitem action=\"find-again\" />"
#ifdef HAVE_WEBKIT_ZOOM_API
" <separator />"
" <menuitem action=\"zoom-in\" />"
" <menuitem action=\"zoom-out\" />"
#endif
" <separator />"
" <menuitem action=\"close\" />"
" </popup>"
......@@ -856,18 +852,14 @@ static void
zoom_in_callback (GtkAction *action,
gpointer data)
{
#ifdef HAVE_WEBKIT_ZOOM_API
webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (view));
#endif
}
static void
zoom_out_callback (GtkAction *action,
gpointer data)
{
#ifdef HAVE_WEBKIT_ZOOM_API
webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (view));
#endif
}
static void
......@@ -1037,12 +1029,8 @@ dialog_unmap (GtkWidget *window,
data.paned_position = gtk_paned_get_position (GTK_PANED (paned));
data.show_index = GTK_WIDGET_VISIBLE (sidebar);
#ifdef HAVE_WEBKIT_ZOOM_API
data.zoom = (view ?
webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (view)) : 1.0);
#else
data.zoom = 1.0;
#endif
gimp_set_data (GIMP_HELP_BROWSER_DIALOG_DATA, &data, sizeof (data));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment