Merge lp:~kalikiana/midori/gtk2.24 into lp:midori

[Cris Dywan]

Bump GTK+ requirement to 2.24 and drop support for earlier versions

Bump GTK+ requirement to 2.24 and drop support for earlier versions

[gue5t gue5t (gue5t)]

Mostly looks good, except:

403 + if (g_str_has_prefix (uri, "mailto:"))
404 + {
405 + gchar* newuri = NULL;
406 + if (!g_str_has_prefix (uri, "mailto:"))

The inner condition will never be true. I don't think the function should be interpreting "fuzzy" URIs anyhow--if we want it to accept "fuzzy" uris, I think we should reuse "stronger" existing functions for the purpose. Most likely though all the logic can simply be removed--we can put full URIs in the dialogs.

review: Needs Fixing

[lp:~kalikiana/midori/gtk2.24]

6228. By Cris Dywan on 2013-06-21

Drop Gtk.AboutDialog::activate-link signal callback

The default works well enough.

6229. By Cris Dywan on 2013-06-21

Remove Gtk.IconEntry compatibility aliases

[gue5t gue5t (gue5t)]

Looks good now.

review: Approve

=== modified file 'README'
--- README	2013-06-17 17:53:51 +0000
+++ README	2013-06-21 20:53:25 +0000
@@ -11,7 +11,7 @@
 * Straightforward bookmark management.
 * Customizable interface, extensions written in C and Vala.
 
-Requirements: GLib 2.22, GTK+ 2.16, WebkitGTK+ 1.8.3, libXML2,
+Requirements: GLib 2.22, GTK+ 2.24, WebkitGTK+ 1.8.3, libXML2,
               libsoup 2.27.90, sqlite 3.0, Vala 0.14, libnotify
 
 Optional: GTK+ 3.0, Unique 0.9, gcr, Granite 0.2, WebKit2GTK+ 1.11.91/ 2.0.0

=== modified file 'extensions/adblock.c'
--- extensions/adblock.c	2013-06-20 20:53:02 +0000
+++ extensions/adblock.c	2013-06-21 20:53:25 +0000
@@ -439,7 +439,6 @@
         gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
 }
 
-#if GTK_CHECK_VERSION (2, 18, 0)
 static gboolean
 adblock_activate_link_cb (GtkWidget*   label,
                           const gchar* uri)
@@ -449,7 +448,6 @@
     midori_browser_set_current_tab (browser, view);
     return TRUE;
 }
-#endif
 
 static GtkWidget*
 adblock_get_preferences_dialog (MidoriExtension* extension)
@@ -512,17 +510,10 @@
         "Type the address of a preconfigured filter list in the text entry "
         "and click \"Add\" to add it to the list. "
         "You can find more lists at %s."),
-        #if GTK_CHECK_VERSION (2, 18, 0)
         "<a href=\"http://adblockplus.org/en/subscriptions\">adblockplus.org/en/subscriptions</a> "
         "<a href=\"http://easylist.adblockplus.org/\">easylist.adblockplus.org</a>");
-        #else
-        "<u>http://adblockplus.org/en/subscriptions</u> "
-        "<u>http://easylist.adblockplus.org/</u>");
-        #endif
-    #if GTK_CHECK_VERSION (2, 18, 0)
     g_signal_connect (button, "activate-link",
         G_CALLBACK (adblock_activate_link_cb), NULL);
-    #endif
     gtk_label_set_markup (GTK_LABEL (button), description);
     g_free (description);
     gtk_label_set_line_wrap (GTK_LABEL (button), TRUE);

=== modified file 'katze/gtk3-compat.h'
--- katze/gtk3-compat.h	2012-12-13 22:58:07 +0000
+++ katze/gtk3-compat.h	2013-06-21 20:53:25 +0000
@@ -50,31 +50,6 @@
     #define g_format_size(sz) g_format_size_for_display ((goffset)sz)
 #endif
 
-#if !GTK_CHECK_VERSION (2, 18, 0)
-    #define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL (widget)
-    #define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS (widget)
-    #define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE (widget)
-    #define gtk_widget_get_sensitive(widget) GTK_WIDGET_IS_SENSITIVE (widget)
-    #define gtk_widget_set_can_focus(widget,flag) \
-        GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS)
-    #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation
-    #define gtk_widget_get_has_window(wdgt) !GTK_WIDGET_NO_WINDOW (wdgt)
-    #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation
-    #define gtk_widget_set_window(wdgt, wndw) wdgt->window = wndw
-    #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE
-    #define gtk_widget_get_drawable GTK_WIDGET_VISIBLE
-    #define gtk_widget_set_has_window(wdgt, wnd) \
-        if (wnd) GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_NO_WINDOW); \
-        else GTK_WIDGET_SET_FLAGS (wdgt, GTK_NO_WINDOW)
-#endif
-
-#if !GTK_CHECK_VERSION (2, 20, 0)
-    #define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED (widget)
-    #define gtk_widget_set_realized(wdgt, real) \
-        if (real) GTK_WIDGET_SET_FLAGS (wdgt, GTK_REALIZED); \
-        else GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_REALIZED)
-#endif
-
 #if GTK_CHECK_VERSION (3, 0, 0)
     #define GTK_DIALOG_NO_SEPARATOR 0
 #endif
@@ -84,15 +59,6 @@
     const gchar* gtk_entry_get_placeholder_text (GtkEntry* entry);
 #endif
 
-#if !GTK_CHECK_VERSION (2, 24 ,0)
-    #define gtk_combo_box_text_append_text gtk_combo_box_append_text
-    #define gtk_combo_box_text_new gtk_combo_box_new_text
-    #define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text
-    #define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text
-    #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
-    #define GtkComboBoxText GtkComboBox
-#endif
-
 #ifndef GDK_KEY_Return
     #define GDK_KEY_0 GDK_0
     #define GDK_KEY_BackSpace GDK_BackSpace

=== modified file 'katze/katze-throbber.c'
--- katze/katze-throbber.c	2013-04-01 14:21:39 +0000
+++ katze/katze-throbber.c	2013-06-21 20:53:25 +0000
@@ -16,16 +16,9 @@
 #include <glib/gi18n.h>
 #include <math.h>
 
-#define HAVE_SPINNER GTK_CHECK_VERSION (2, 20, 0)
-
 struct _KatzeThrobber
 {
-    #if HAVE_SPINNER
     GtkSpinner parent_instance;
-    #else
-    GtkMisc parent_instance;
-    #endif
-
     GtkIconSize icon_size;
     gchar* icon_name;
     GdkPixbuf* pixbuf;
@@ -43,18 +36,10 @@
 
 struct _KatzeThrobberClass
 {
-    #if HAVE_SPINNER
     GtkSpinnerClass parent_class;
-    #else
-    GtkMiscClass parent_class;
-    #endif
 };
 
-#if HAVE_SPINNER
 G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_SPINNER);
-#else
-G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_MISC);
-#endif
 
 enum
 {
@@ -136,14 +121,6 @@
 static void
 icon_theme_changed (KatzeThrobber* throbber);
 
-#if !HAVE_SPINNER
-static gboolean
-katze_throbber_timeout (KatzeThrobber* throbber);
-
-static void
-katze_throbber_timeout_destroy (KatzeThrobber* throbber);
-#endif
-
 static void
 katze_throbber_class_init (KatzeThrobberClass* class)
 {
@@ -251,9 +228,6 @@
 katze_throbber_init (KatzeThrobber *throbber)
 {
     gtk_widget_set_has_window (GTK_WIDGET (throbber), FALSE);
-    #if !HAVE_SPINNER
-    gtk_misc_set_alignment (GTK_MISC (throbber), 0.0, 0.5);
-    #endif
 
     throbber->timer_id = -1;
 }
@@ -486,14 +460,7 @@
 
     throbber->animated = animated;
 
-    #if HAVE_SPINNER
     g_object_set (throbber, "active", animated, NULL);
-    #else
-    if (animated && (throbber->timer_id < 0))
-        throbber->timer_id = midori_timeout_add (50,
-            (GSourceFunc)katze_throbber_timeout, throbber,
-            (GDestroyNotify)katze_throbber_timeout_destroy);
-    #endif
     gtk_widget_queue_draw (GTK_WIDGET (throbber));
 
     g_object_notify (G_OBJECT (throbber), "animated");
@@ -797,24 +764,6 @@
         GTK_WIDGET_CLASS (katze_throbber_parent_class)->unmap (widget);
 }
 
-#if !HAVE_SPINNER
-static gboolean
-katze_throbber_timeout (KatzeThrobber*  throbber)
-{
-    throbber->index++;
-    gtk_widget_queue_draw (GTK_WIDGET (throbber));
-
-    return throbber->animated;
-}
-
-static void
-katze_throbber_timeout_destroy (KatzeThrobber*  throbber)
-{
-    throbber->index = 0;
-    throbber->timer_id = -1;
-}
-#endif
-
 static void
 katze_throbber_style_set (GtkWidget* widget,
                           GtkStyle*  prev_style)
@@ -888,16 +837,9 @@
     GtkAllocation allocation;
     GtkRequisition requisition;
 
-    #if HAVE_SPINNER
     xalign = 0.0;
     yalign = 0.5;
     xpad = ypad = 0.0;
-    #else
-    gtk_misc_get_alignment (GTK_MISC (widget), &xalign, &yalign);
-    if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-        xalign = 1.0f - xalign;
-    gtk_misc_get_padding (GTK_MISC (widget), &xpad, &ypad);
-    #endif
 
     #if GTK_CHECK_VERSION (3, 0, 0)
     allocation.x = allocation.y = 0;
@@ -978,75 +920,12 @@
     }
     else
     {
-        #if HAVE_SPINNER
         if (throbber->animated)
 #if GTK_CHECK_VERSION (3, 0, 0)
             return GTK_WIDGET_CLASS (katze_throbber_parent_class)->draw (widget, cr);
 #else
             return GTK_WIDGET_CLASS (katze_throbber_parent_class)->expose_event (widget, event);
 #endif
-        #else
-        gint cols, rows;
-
-        if (G_UNLIKELY (throbber->icon_name && !throbber->pixbuf))
-        {
-            icon_theme_changed (KATZE_THROBBER (widget));
-
-            if (!throbber->pixbuf)
-            {
-                /* Fallback to a stock icon */
-                katze_assign (throbber->icon_name, g_strdup (GTK_STOCK_EXECUTE));
-                g_object_notify (G_OBJECT (throbber), "icon-name");
-                return TRUE;
-            }
-        }
-
-        cols = gdk_pixbuf_get_width (throbber->pixbuf) / throbber->width;
-        rows = gdk_pixbuf_get_height (throbber->pixbuf) / throbber->height;
-
-        if (G_UNLIKELY (cols == 1 && cols == rows))
-        {
-            katze_throbber_aligned_coords (widget, &ax, &ay);
-
-            if (throbber->animated)
-                gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf,
-                                 0, 0, ax, ay,
-                                 throbber->width, throbber->height,
-                                 GDK_RGB_DITHER_NONE, 0, 0);
-            return TRUE;
-        }
-
-        if (G_LIKELY (cols > 0 && rows > 0))
-        {
-            gint idx;
-            guint x, y;
-
-            katze_throbber_aligned_coords (widget, &ax, &ay);
-
-            idx = throbber->index % (cols * rows);
-            if (G_LIKELY (throbber->timer_id >= 0))
-                idx = MAX (idx, 1);
-
-            x = (idx % cols) * throbber->width;
-            y = (idx / cols) * throbber->height;
-
-            gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf,
-                             x, y, ax, ay,
-                             throbber->width, throbber->height,
-                             GDK_RGB_DITHER_NONE, 0, 0);
-        }
-        else
-        {
-            g_warning (_("Animation frames are broken"));
-            katze_assign (throbber->icon_name, NULL);
-            katze_object_assign (throbber->pixbuf, NULL);
-
-            g_object_freeze_notify (G_OBJECT (throbber));
-            g_object_notify (G_OBJECT (throbber), "icon-name");
-            g_object_notify (G_OBJECT (throbber), "pixbuf");
-            g_object_thaw_notify (G_OBJECT (throbber));
-        }
-        #endif
     }
 
     return TRUE;

=== removed file 'midori/gtkiconentry.h'
--- midori/gtkiconentry.h	2012-11-18 15:48:46 +0000
+++ midori/gtkiconentry.h	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2004-2006 Christian Hammond.
- * Copyright (C) 2008 Cody Russell  <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
- */
-
-#ifndef __GTK_ICON_ENTRY_H__
-#define __GTK_ICON_ENTRY_H__
-
-#include <gio/gio.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-    #define GtkIconEntryPosition GtkEntryIconPosition
-    #define GTK_ICON_ENTRY_PRIMARY GTK_ENTRY_ICON_PRIMARY
-    #define GTK_ICON_ENTRY_SECONDARY GTK_ENTRY_ICON_SECONDARY
-    #define GTK_ICON_ENTRY GTK_ENTRY
-    #define gtk_icon_entry_set_icon_from_stock gtk_entry_set_icon_from_stock
-    #define gtk_icon_entry_set_icon_from_icon_name gtk_entry_set_icon_from_icon_name
-
-    #define gtk_icon_entry_set_tooltip gtk_entry_set_icon_tooltip_text
-    #define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable
-
-G_END_DECLS
-
-#endif /* __GTK_ICON_ENTRY_H__ */

=== modified file 'midori/main.c'
--- midori/main.c	2013-05-23 21:10:22 +0000
+++ midori/main.c	2013-06-21 20:53:25 +0000
@@ -39,36 +39,16 @@
     g_free (uri);
 }
 
-#define HAVE_OFFSCREEN GTK_CHECK_VERSION (2, 20, 0)
-
 #ifndef HAVE_WEBKIT2
 static void
 snapshot_load_finished_cb (GtkWidget*      web_view,
                            WebKitWebFrame* web_frame,
                            gchar*          filename)
 {
-    #if HAVE_OFFSCREEN
     GdkPixbuf* pixbuf = gtk_offscreen_window_get_pixbuf (GTK_OFFSCREEN_WINDOW (
         gtk_widget_get_parent (web_view)));
     gdk_pixbuf_save (pixbuf, filename, "png", NULL, "compression", "7", NULL);
     g_object_unref (pixbuf);
-    #else
-    GError* error;
-    GtkPrintOperation* operation = gtk_print_operation_new ();
-
-    gtk_print_operation_set_export_filename (operation, filename);
-    error = NULL;
-    webkit_web_frame_print_full (web_frame, operation,
-        GTK_PRINT_OPERATION_ACTION_EXPORT, &error);
-
-    if (error != NULL)
-    {
-        g_error ("%s", error->message);
-        gtk_main_quit ();
-    }
-
-    g_object_unref (operation);
-    #endif
     g_print (_("Snapshot saved to: %s\n"), filename);
     gtk_main_quit ();
 }
@@ -268,14 +248,10 @@
         gchar* filename;
         GtkWidget* web_view;
         gchar* uri;
-        #if HAVE_OFFSCREEN
         GtkWidget* offscreen;
         GdkScreen* screen;
 
         gint fd = g_file_open_tmp ("snapshot-XXXXXX.png", &filename, &error);
-        #else
-        gint fd = g_file_open_tmp ("snapshot-XXXXXX.pdf", &filename, &error);
-        #endif
         close (fd);
 
         if (error)
@@ -291,7 +267,6 @@
         }
 
         web_view = webkit_web_view_new ();
-        #if HAVE_OFFSCREEN
         offscreen = gtk_offscreen_window_new ();
         gtk_container_add (GTK_CONTAINER (offscreen), web_view);
         if ((screen = gdk_screen_get_default ()))
@@ -300,7 +275,6 @@
         else
             gtk_widget_set_size_request (web_view, 800, 600);
         gtk_widget_show_all (offscreen);
-        #endif
         #ifndef HAVE_WEBKIT2
         g_signal_connect (web_view, "load-finished",
             G_CALLBACK (snapshot_load_finished_cb), filename);

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-06-21 19:21:07 +0000
+++ midori/midori-browser.c	2013-06-21 20:53:25 +0000
@@ -997,11 +997,7 @@
     if (!is_folder)
     {
         entry_uri = katze_uri_entry_new (
-        #if GTK_CHECK_VERSION (2, 20, 0)
             gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT));
-        #else
-            NULL);
-        #endif
         gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE);
         gtk_entry_set_text (GTK_ENTRY (entry_uri), katze_item_get_uri (bookmark));
         gtk_box_pack_start (GTK_BOX (vbox), entry_uri, FALSE, FALSE, 0);
@@ -4689,32 +4685,6 @@
 static const gchar* credits_artists[] =
     { "Nancy Runge <[e-mail]>", NULL };
 
-#if !GTK_CHECK_VERSION (2, 24, 0)
-static void
-_action_about_activate_link (GtkAboutDialog* about,
-                             const gchar*    uri,
-                             gpointer        user_data)
-{
-    MidoriBrowser* browser = MIDORI_BROWSER (user_data);
-    GtkWidget* view = midori_browser_add_uri (browser, uri);
-    midori_browser_set_current_tab (browser, view);
-}
-
-static void
-_action_about_activate_email (GtkAboutDialog* about,
-                              const gchar*    uri,
-                              gpointer        user_data)
-{
-    /* Some email clients need the 'mailto' to function properly */
-    gchar* newuri = NULL;
-    if (!g_str_has_prefix (uri, "mailto:"))
-        newuri = g_strconcat ("mailto:", uri, NULL);
-
-    sokoke_show_uri (NULL, newuri ? newuri : uri, GDK_CURRENT_TIME, NULL);
-    g_free (newuri);
-}
-#endif
-
 static gchar*
 midori_browser_get_docs (gboolean error)
 {
@@ -4748,10 +4718,6 @@
     "License as published by the Free Software Foundation; either "
     "version 2.1 of the License, or (at your option) any later version.");
 
-#if !GTK_CHECK_VERSION (2, 24, 0)
-    gtk_about_dialog_set_email_hook (_action_about_activate_email, NULL, NULL);
-    gtk_about_dialog_set_url_hook (_action_about_activate_link, browser, NULL);
-#endif
 #ifdef HAVE_GRANITE
     gchar* docs = midori_browser_get_docs (FALSE);
     /* Avoid granite_widgets_show_about_dialog for invalid memory and crashes */
@@ -6358,29 +6324,8 @@
 
     /* Statusbar */
     browser->statusbar = gtk_statusbar_new ();
-    #if GTK_CHECK_VERSION (2, 20, 0)
     browser->statusbar_contents =
         gtk_statusbar_get_message_area (GTK_STATUSBAR (browser->statusbar));
-    #else
-    /* Rearrange the statusbar packing. This is necessariy to keep
-        themes happy while there is no support from GtkStatusbar. */
-    forward = GTK_STATUSBAR (browser->statusbar)->label;
-    if (GTK_IS_BOX (gtk_widget_get_parent (forward)))
-        browser->statusbar_contents = gtk_widget_get_parent (forward);
-    else
-    {
-        browser->statusbar_contents = gtk_hbox_new (FALSE, 4);
-        gtk_widget_show (browser->statusbar_contents);
-        g_object_ref (GTK_STATUSBAR (browser->statusbar)->label);
-        gtk_container_remove (
-            GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame), forward);
-        gtk_box_pack_start (GTK_BOX (browser->statusbar_contents),
-            forward, TRUE, TRUE, 0);
-        g_object_unref (forward);
-        gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame),
-                           browser->statusbar_contents);
-    }
-    #endif
     gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0);
 
     g_signal_connect (browser->statusbar, "button-press-event",

=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2013-05-21 16:08:19 +0000
+++ midori/midori-locationaction.c	2013-06-21 20:53:25 +0000
@@ -945,10 +945,10 @@
     #if GTK_CHECK_VERSION (3, 6, 0)
     gtk_entry_set_input_purpose (GTK_ENTRY (entry), GTK_INPUT_PURPOSE_URL);
     #endif
-    gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
-         GTK_ICON_ENTRY_PRIMARY, TRUE);
-    gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
-         GTK_ICON_ENTRY_SECONDARY, TRUE);
+    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
+         GTK_ENTRY_ICON_PRIMARY, TRUE);
+    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
+         GTK_ENTRY_ICON_SECONDARY, TRUE);
 
     targetlist = gtk_target_list_new (NULL, 0);
     gtk_target_list_add_uri_targets (targetlist, 0);
@@ -1235,7 +1235,6 @@
     return FALSE;
 }
 
-#if GTK_CHECK_VERSION (2, 19, 3)
 static void
 midori_location_action_preedit_changed_cb (GtkWidget*   entry,
                                            const gchar* preedit,
@@ -1245,7 +1244,6 @@
     gchar* key = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
     midori_location_action_popup_completion (location_action, entry, key);
 }
-#endif
 
 static gboolean
 midori_location_action_focus_in_event_cb (GtkWidget*   widget,
@@ -1450,10 +1448,10 @@
     /* The dialog should "toggle" like a menu, as far as users go
        FIXME: Half-working: the dialog closes but re-opens */
     static GtkWidget* dialog = NULL;
-    if (icon_pos == GTK_ICON_ENTRY_PRIMARY && dialog != NULL)
+    if (icon_pos == GTK_ENTRY_ICON_PRIMARY && dialog != NULL)
         gtk_widget_destroy (dialog);
 
-    if (icon_pos == GTK_ICON_ENTRY_PRIMARY)
+    if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
     {
         /* No "security" window for blank pages */
         if (midori_uri_is_blank (MIDORI_LOCATION_ACTION (action)->text))
@@ -1501,7 +1499,7 @@
         g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog);
         gtk_widget_show_all (dialog);
     }
-    if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
+    if (icon_pos == GTK_ENTRY_ICON_SECONDARY)
     {
         gboolean result;
         g_signal_emit (action, signals[SECONDARY_ICON_RELEASED], 0,
@@ -1578,10 +1576,8 @@
                       midori_location_action_button_press_event_cb, action,
                       "signal::key-press-event",
                       midori_location_action_key_press_event_cb, action,
-                      #if GTK_CHECK_VERSION (2, 19, 3)
                       "signal-after::preedit-changed",
                       midori_location_action_preedit_changed_cb, action,
-                      #endif
                       "signal::focus-in-event",
                       midori_location_action_focus_in_event_cb, action,
                       "signal::focus-out-event",
@@ -1735,11 +1731,11 @@
     {
         GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data);
         if (stock_id && gtk_stock_lookup (stock_id, &stock_item))
-            gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
-                GTK_ICON_ENTRY_SECONDARY, stock_id);
+            gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+                GTK_ENTRY_ICON_SECONDARY, stock_id);
         else
-            gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
-                GTK_ICON_ENTRY_SECONDARY, stock_id);
+            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+                GTK_ENTRY_ICON_SECONDARY, stock_id);
     }
 }
 
@@ -1768,8 +1764,8 @@
     if (GTK_IS_TOOL_ITEM (proxies->data))
     {
         GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data);
-        gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon);
-        gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, tooltip);
+        gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, icon);
+        gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, tooltip);
     }
 }
 

=== modified file 'midori/midori-platform.h'
--- midori/midori-platform.h	2013-05-19 09:33:02 +0000
+++ midori/midori-platform.h	2013-06-21 20:53:25 +0000
@@ -14,7 +14,6 @@
 
 #include "midori/midori-stock.h"
 #include "katze/gtk3-compat.h"
-#include "midori/gtkiconentry.h"
 #include "midori/sokoke.h"
 
 /* Common behavior modifiers */

=== modified file 'midori/midori-searchaction.c'
--- midori/midori-searchaction.c	2013-06-19 20:27:53 +0000
+++ midori/midori-searchaction.c	2013-06-21 20:53:25 +0000
@@ -312,8 +312,8 @@
 
     toolitem = GTK_WIDGET (gtk_tool_item_new ());
     entry = sokoke_search_entry_new (NULL);
-    gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
-                                       GTK_ICON_ENTRY_PRIMARY, TRUE);
+    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
+                                       GTK_ENTRY_ICON_PRIMARY, TRUE);
     alignment = gtk_alignment_new (0, 0.5, 1, 0.1);
     gtk_container_add (GTK_CONTAINER (alignment), entry);
     gtk_widget_show (entry);
@@ -402,7 +402,7 @@
 
 static void
 midori_search_action_icon_released_cb (GtkWidget*           entry,
-                                       GtkIconEntryPosition icon_pos,
+                                       GtkEntryIconPosition icon_pos,
                                        gint                 button,
                                        GtkAction*           action)
 {
@@ -413,7 +413,7 @@
     GdkPixbuf* icon;
     GtkWidget* image;
 
-    if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
+    if (icon_pos == GTK_ENTRY_ICON_SECONDARY)
         return;
 
     search_engines = MIDORI_SEARCH_ACTION (action)->search_engines;
@@ -502,16 +502,16 @@
                 icon_name = "edit-find-option";
             else
                 icon_name = STOCK_EDIT_FIND;
-            gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
-                GTK_ICON_ENTRY_PRIMARY, icon_name);
+            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+                GTK_ENTRY_ICON_PRIMARY, icon_name);
         }
         gtk_entry_set_placeholder_text (GTK_ENTRY (entry),
             katze_item_get_name (search_action->current_item));
     }
     else
     {
-        gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
-                                            GTK_ICON_ENTRY_PRIMARY,
+        gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+                                            GTK_ENTRY_ICON_PRIMARY,
                                             GTK_STOCK_FIND);
         gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "");
     }
@@ -1102,11 +1102,7 @@
     gtk_size_group_add_widget (sizegroup, label);
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
     entry_uri = katze_uri_entry_new (
-    #if GTK_CHECK_VERSION (2, 20, 0)
         gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT));
-    #else
-        NULL);
-    #endif
     g_object_set_data (G_OBJECT (entry_uri), "allow_%s", (void*)1);
     gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE);
     gtk_entry_set_text (GTK_ENTRY (entry_uri),

=== modified file 'midori/midori-speeddial.vala'
--- midori/midori-speeddial.vala	2013-05-19 09:33:02 +0000
+++ midori/midori-speeddial.vala	2013-06-21 20:53:25 +0000
@@ -339,14 +339,9 @@
                 return;
 
             return_if_fail (spec != null);
-            #if HAVE_OFFSCREEN
             var img = (thumb_view.parent as Gtk.OffscreenWindow).get_pixbuf ();
             var pixbuf_scaled = img.scale_simple (240, 160, Gdk.InterpType.TILES);
             img = pixbuf_scaled;
-            #else
-            thumb_view.realize ();
-            var img = midori_view_web_view_get_snapshot (thumb_view, 240, 160);
-            #endif
             unowned string title = thumb_view.get_title ();
             add_with_id (spec.dial_id, spec.uri, title ?? spec.uri, img);
 
@@ -373,22 +368,10 @@
                 if (settings.get_class ().find_property ("enable-java-applet") != null)
                     settings.set ("enable-java-applet", false);
                 thumb_view.settings = settings;
-                #if HAVE_OFFSCREEN
                 var offscreen = new Gtk.OffscreenWindow ();
                 offscreen.add (thumb_view);
                 thumb_view.set_size_request (800, 600);
                 offscreen.show_all ();
-                #else
-                /* What we are doing here is a bit of a hack. In order to render a
-                   thumbnail we need a new view and load the url in it. But it has
-                   to be visible and packed in a container. So we secretly pack it
-                   into the notebook of the parent browser. */
-                notebook.add (thumb_view);
-                thumb_view.destroy.connect (Gtk.widget_destroyed);
-                /* We use an empty label. It's not invisible but hard to spot. */
-                notebook.set_tab_label (thumb_view, new Gtk.EventBox ());
-                thumb_view.show ();
-                #endif
             }
 
             thumb_queue.append (new Spec (dial_id, uri));

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-06-19 21:00:46 +0000
+++ midori/midori-view.c	2013-06-21 20:53:25 +0000
@@ -969,9 +969,6 @@
     }
 }
 
-#define HAVE_GTK_INFO_BAR GTK_CHECK_VERSION (2, 18, 0)
-
-#if HAVE_GTK_INFO_BAR
 static void
 midori_view_infobar_response_cb (GtkWidget* infobar,
                                  gint       response,
@@ -983,20 +980,6 @@
         response_cb (infobar, response, data_object);
     gtk_widget_destroy (infobar);
 }
-#else
-static void
-midori_view_info_bar_button_cb (GtkWidget* button,
-                                gpointer   data_object)
-{
-    GtkWidget* infobar = gtk_widget_get_parent (gtk_widget_get_parent (button));
-    gint response = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "midori-infobar-response"));
-    void (*response_cb) (GtkWidget*, gint, gpointer);
-    response_cb = g_object_get_data (G_OBJECT (infobar), "midori-infobar-cb");
-    if (response_cb != NULL)
-        response_cb (infobar, response, data_object);
-    gtk_widget_destroy (infobar);
-}
-#endif
 
 /**
  * midori_view_add_info_bar
@@ -1037,7 +1020,6 @@
 
     va_start (args, first_button_text);
 
-    #if HAVE_GTK_INFO_BAR
     infobar = gtk_info_bar_new ();
     for (button_text = first_button_text; button_text;
          button_text = va_arg (args, const gchar*))
@@ -1053,29 +1035,6 @@
                                     GTK_ORIENTATION_HORIZONTAL);
     g_signal_connect (infobar, "response",
         G_CALLBACK (midori_view_infobar_response_cb), data_object);
-    #else
-    infobar = gtk_hbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (infobar), 4);
-
-    content_area = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (infobar), content_area, TRUE, TRUE, 0);
-    action_area = gtk_hbutton_box_new ();
-    for (button_text = first_button_text; button_text;
-         button_text = va_arg (args, const gchar*))
-    {
-        gint response_id = va_arg (args, gint);
-        GtkWidget* button = gtk_button_new_with_mnemonic (button_text);
-        g_object_set_data (G_OBJECT (button), "midori-infobar-response",
-                           GINT_TO_POINTER (response_id));
-        g_signal_connect (button, "clicked",
-            G_CALLBACK (midori_view_info_bar_button_cb), data_object);
-        gtk_box_pack_start (GTK_BOX (action_area), button, FALSE, FALSE, 0);
-        if (response_id == GTK_RESPONSE_HELP)
-            gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area),
-                                                button, TRUE);
-    }
-    gtk_box_pack_start (GTK_BOX (infobar), action_area, FALSE, FALSE, 0);
-    #endif
 
     va_end (args);
     label = gtk_label_new (message);
@@ -5383,9 +5342,7 @@
     WebKitWebFrame* frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
     GtkPrintOperation* operation = gtk_print_operation_new ();
     gtk_print_operation_set_custom_tab_label (operation, _("Features"));
-    #if GTK_CHECK_VERSION (2, 18, 0)
     gtk_print_operation_set_embed_page_setup (operation, TRUE);
-    #endif
     g_signal_connect (operation, "create-custom-widget",
         G_CALLBACK (midori_view_print_create_custom_widget_cb), view);
     GError* error = NULL;

=== modified file 'midori/sokoke.c'
--- midori/sokoke.c	2013-05-27 00:00:58 +0000
+++ midori/sokoke.c	2013-06-21 20:53:25 +0000
@@ -1096,9 +1096,8 @@
     const gchar* text = gtk_entry_get_text (entry);
     gboolean visible = text && *text
       && ! sokoke_entry_has_placeholder_text (entry);
-    gtk_icon_entry_set_icon_from_stock (
-        GTK_ICON_ENTRY (entry),
-        GTK_ICON_ENTRY_SECONDARY,
+    gtk_entry_set_icon_from_stock (
+        entry, GTK_ENTRY_ICON_SECONDARY,
         visible ? GTK_STOCK_CLEAR : NULL);
 }
 
@@ -1113,11 +1112,11 @@
 
 static void
 sokoke_entry_icon_released_cb (GtkEntry*            entry,
-                               GtkIconEntryPosition icon_pos,
+                               GtkEntryIconPosition icon_pos,
                                GdkEvent*            event,
                                gpointer             user_data)
 {
-    if (icon_pos != GTK_ICON_ENTRY_SECONDARY)
+    if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
         return;
 
     gtk_entry_set_text (entry, "");
@@ -1131,7 +1130,7 @@
     gtk_entry_set_placeholder_text (GTK_ENTRY (entry), placeholder_text);
     gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
                                    GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
-    gtk_icon_entry_set_icon_highlight (GTK_ENTRY (entry),
+    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
         GTK_ENTRY_ICON_SECONDARY, TRUE);
     {
         g_object_connect (entry,

=== modified file 'toolbars/midori-findbar.c'
--- toolbars/midori-findbar.c	2012-10-10 22:25:05 +0000
+++ toolbars/midori-findbar.c	2013-06-21 20:53:25 +0000
@@ -46,7 +46,7 @@
 
 static void
 midori_findbar_set_icon (MidoriFindbar*       findbar,
-                         GtkIconEntryPosition icon_pos,
+                         GtkEntryIconPosition icon_pos,
                          const gchar*         icon_name)
 {
     if (icon_name != NULL)
@@ -57,7 +57,7 @@
         g_free (symbolic_icon_name);
     }
     else
-        gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (findbar->find_text),
+        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (findbar->find_text),
                                                 icon_pos, NULL);
 }
 
@@ -146,7 +146,7 @@
         gtk_widget_grab_focus (GTK_WIDGET (findbar->find_text));
     else
     {
-        midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, STOCK_EDIT_FIND);
+        midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_PRIMARY, STOCK_EDIT_FIND);
         gtk_widget_show (GTK_WIDGET (findbar->find_case));
         gtk_widget_show (GTK_WIDGET (findbar->find_close));
         if (selected_text != NULL)
@@ -188,11 +188,11 @@
     if (g_utf8_strlen (preedit, -1) >= 1)
     {
         gboolean case_sensitive = midori_findbar_case_sensitive (findbar);
-        midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, STOCK_EDIT_CLEAR);
+        midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_SECONDARY, STOCK_EDIT_CLEAR);
         midori_tab_find (MIDORI_TAB (view), preedit, case_sensitive, TRUE);
     }
     else
-        midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, NULL);
+        midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_SECONDARY, NULL);
 }
 
 static void
@@ -292,7 +292,7 @@
     const gchar* text;
     gboolean case_sensitive;
 
-    midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, found ? STOCK_EDIT_FIND : STOCK_STOP);
+    midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_PRIMARY, found ? STOCK_EDIT_FIND : STOCK_STOP);
 
     if (typing)
     {

=== modified file 'wscript'
--- wscript	2013-06-17 17:53:51 +0000
+++ wscript	2013-06-21 20:53:25 +0000
@@ -263,7 +263,7 @@
         conf.env.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN')
         conf.env.append_value ('VALAFLAGS', '-D HAVE_DOM')
     else:
-        check_pkg ('gtk+-2.0', '2.16.0', var='GTK')
+        check_pkg ('gtk+-2.0', '2.24.0', var='GTK')
         check_pkg ('webkit-1.0', '1.8.3', args=args)
         conf.define ('GCR_VERSION', 'No')
         check_pkg ('javascriptcoregtk-1.0', '1.8.3', args=args)