From eed822dc8b8775431b70d4d8e844adab382f8704 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 8 Nov 2011 21:52:47 +0100 Subject: [PATCH] Add gtk_image_menu_item_set_always_show_image to gtk3-compat.h --- katze/gtk3-compat.h | 1 + katze/katze-arrayaction.c | 4 ---- midori/midori-searchaction.c | 2 -- midori/midori-view.c | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/katze/gtk3-compat.h b/katze/gtk3-compat.h index 5858a731..2f058deb 100644 --- a/katze/gtk3-compat.h +++ b/katze/gtk3-compat.h @@ -31,6 +31,7 @@ G_BEGIN_DECLS #define gtk_menu_item_set_label(menuitem, label) \ gtk_label_set_label (GTK_LABEL (GTK_BIN (menuitem)->child), \ label ? label : ""); + #define gtk_image_menu_item_set_always_show_image(menuitem, yesno) () #endif #if !GTK_CHECK_VERSION (2, 18, 0) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index 1f9af0f5..c8384463 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -398,10 +398,8 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, g_object_unref (icon); } gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - #if GTK_CHECK_VERSION (2, 16, 0) gtk_image_menu_item_set_always_show_image ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - #endif gtk_menu_shell_append (menu, menuitem); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); if (KATZE_ITEM_IS_FOLDER (item)) @@ -622,10 +620,8 @@ katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy, g_object_unref (icon); } gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - #if GTK_CHECK_VERSION (2, 16, 0) gtk_image_menu_item_set_always_show_image ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - #endif g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); if (KATZE_ITEM_IS_FOLDER (item)) { diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index bb87bab8..687cb77f 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -473,10 +473,8 @@ midori_search_action_icon_released_cb (GtkWidget* entry, gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - #if GTK_CHECK_VERSION (2, 16, 0) gtk_image_menu_item_set_always_show_image ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - #endif gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "engine", item); g_signal_connect (menuitem, "activate", diff --git a/midori/midori-view.c b/midori/midori-view.c index 5f511947..21678c47 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2450,10 +2450,8 @@ midori_view_populate_popup (MidoriView* view, else icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - #if GTK_CHECK_VERSION (2, 16, 0) gtk_image_menu_item_set_always_show_image ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - #endif gtk_menu_shell_insert (GTK_MENU_SHELL (sub_menu), menuitem, i); g_object_set_data (G_OBJECT (menuitem), "search", (gchar*)katze_item_get_uri (item)); -- 2.39.5