From c711a75379daadbae5193751dbe0d93147ed6a01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Enrico=20Tr=C3=B6ger?= Date: Mon, 27 Apr 2009 21:30:27 +0200 Subject: [PATCH] No need to work around GtkIconEntry issue afterall --- midori/gtkiconentry.c | 11 ----------- midori/gtkiconentry.h | 7 ++----- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index bda44ca4..6bb7e869 100644 --- 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 diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h index 8f910cff..d34ff962 100644 --- 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 -- 2.39.5