[gimp/gimp-2-6] help-browser: removed obsolete check for zoom API

[Sven Neumann <neo src gnome org>]

commit e72d7c87fc5339853fba878df52e3fa460b8fca4
Author: Sven Neumann <sven gimp org>
Date:   Tue May 12 09:44:58 2009 +0200

    help-browser: removed obsolete check for zoom API
    
    Removed the check for the webkit zoom API and compile the respective
    code unconditionally.
    (cherry picked from commit 2d1b3ddf725792102e7ddd5523d0f8bea3d0c101)

 configure.in                   |    9 ---------
 plug-ins/help-browser/dialog.c |   12 ------------
 2 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/configure.in b/configure.in
index 71513d0..c0c726c 100644
--- a/configure.in
+++ b/configure.in
@@ -1241,15 +1241,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)
 
 
diff --git a/plug-ins/help-browser/dialog.c b/plug-ins/help-browser/dialog.c
index 159c67a..873ffb5 100644
--- a/plug-ins/help-browser/dialog.c
+++ b/plug-ins/help-browser/dialog.c
@@ -301,9 +301,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),
@@ -705,11 +703,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>"
@@ -857,18 +853,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
@@ -1038,12 +1030,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));