No need to work around GtkIconEntry issue afterall

diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c
index bda44ca4d817541f5baf35b37a4d6c39dd6af9df..6bb7e86987b9a5be5f6cd0d4edf5804a61612a3e 100644 (file)
--- a/midori/gtkiconentry.c
+++ b/midori/gtkiconentry.c
@@ -33,17 +33,6 @@ gtk_icon_entry_set_icon_from_pixbuf (GtkEntry*            entry,
     gtk_widget_show (GTK_WIDGET (entry));
 }
 
-void
-gtk_icon_entry_set_icon_from_stock  (GtkEntry*            entry,
-                                    GtkEntryIconPosition position,
-                                    const gchar*         stock_id)
-{
-    if (stock_id)
-       gtk_entry_set_icon_from_stock(entry, position, stock_id);
-    else
-       gtk_icon_entry_set_icon_from_pixbuf(entry, position, NULL);
-}
-
 #else
 
 #include <string.h>

diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h
index 8f910cff460684bff47b5c96e8191171977655ea..d34ff9620552797813c5b999cdfac2a678ed5484 100644 (file)
--- a/midori/gtkiconentry.h
+++ b/midori/gtkiconentry.h
@@ -38,15 +38,12 @@ G_BEGIN_DECLS
     #define GTK_ICON_ENTRY GTK_ENTRY
     #define GTK_TYPE_ICON_ENTRY GTK_TYPE_ENTRY
     #define gtk_icon_entry_new gtk_entry_new
+    #define gtk_icon_entry_set_icon_from_stock gtk_entry_set_icon_from_stock
+
     void
     gtk_icon_entry_set_icon_from_pixbuf (GtkEntry*            entry,
                                          GtkEntryIconPosition position,
                                          GdkPixbuf*           pixbuf);
-    void
-    gtk_icon_entry_set_icon_from_stock  (GtkEntry*            entry,
-                                         GtkEntryIconPosition position,
-                                         const gchar*         stock_id);
-
     #define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable
 #else