From ebb3a795a351ca600eb539ed2bba013a6533d749 Mon Sep 17 00:00:00 2001
From: raveit65 <mate@raveit.de>
Date: Fri, 6 Oct 2023 17:58:58 +0200
Subject: replace deprecated gtk-image-menu-item*

---
 mate-panel/menu.c             | 9 ++++-----
 mate-panel/panel-menu-bar.c   | 6 ++++--
 mate-panel/panel-menu-items.c | 9 +++++----
 mate-panel/panel-recent.c     | 6 ++++--
 4 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'mate-panel')

diff --git a/mate-panel/menu.c b/mate-panel/menu.c
index 2256d799..b72127ff 100644
--- a/mate-panel/menu.c
+++ b/mate-panel/menu.c
@@ -32,6 +32,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <libmate-desktop/mate-gsettings.h>
+#include <libmate-desktop/mate-image-menu-item.h>
 #include <matemenu-tree.h>
 
 #include <libpanel-util/panel-keyfile.h>
@@ -768,7 +769,7 @@ setup_menuitem (GtkWidget   *menuitem,
 
 		gtk_icon_size_lookup (icon_size, NULL, &icon_height);
 		gtk_widget_show (image);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem),
+		mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menuitem),
 					       image);
 		gtk_image_set_pixel_size (GTK_IMAGE(image), icon_height);
 	}
@@ -964,9 +965,7 @@ panel_image_menu_item_new (void)
 {
 	GtkWidget *menuitem;
 
-	menuitem = gtk_image_menu_item_new ();
-	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem),
-						   TRUE);
+	menuitem = mate_image_menu_item_new ();
 	return menuitem;
 }
 
@@ -983,7 +982,7 @@ create_submenu_entry (GtkWidget          *menu,
 	if (force_categories_icon)
 		menuitem = panel_image_menu_item_new ();
 	else
-		menuitem = gtk_image_menu_item_new ();
+		menuitem = mate_image_menu_item_new ();
 
 	setup_menuitem_with_icon (menuitem,
 				  panel_menu_icon_get_size (),
diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
index 334f8c9f..fa35d57f 100644
--- a/mate-panel/panel-menu-bar.c
+++ b/mate-panel/panel-menu-bar.c
@@ -32,6 +32,8 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
+#include <libmate-desktop/mate-image-menu-item.h>
+
 #include <libpanel-util/panel-error.h>
 #include <libpanel-util/panel-launch.h>
 #include <libpanel-util/panel-show.h>
@@ -135,12 +137,12 @@ panel_menu_bar_update_visibility (GSettings    *settings,
 			image = gtk_image_new_from_icon_name(str, icon_size);
 		else
 			image = gtk_image_new_from_icon_name(PANEL_ICON_MAIN_MENU, icon_size);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menubar->priv->applications_item), image);
+		mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menubar->priv->applications_item), image);
 		gtk_image_set_pixel_size (GTK_IMAGE (image), icon_height);
 		g_free (str);
 	}
 	else
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menubar->priv->applications_item), NULL);
+		mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menubar->priv->applications_item), NULL);
 }
 
 static void panel_menu_bar_init(PanelMenuBar* menubar)
diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c
index aa4c5d1f..2605de9b 100644
--- a/mate-panel/panel-menu-items.c
+++ b/mate-panel/panel-menu-items.c
@@ -41,6 +41,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <libmate-desktop/mate-gsettings.h>
+#include <libmate-desktop/mate-image-menu-item.h>
 
 #include <libpanel-util/panel-error.h>
 #include <libpanel-util/panel-glib.h>
@@ -231,7 +232,7 @@ panel_menu_items_append_from_desktop (GtkWidget *menu,
 	if (use_icon) {
 		item = panel_image_menu_item_new ();
         } else {
-		item = gtk_image_menu_item_new ();
+		item = mate_image_menu_item_new ();
 	}
 
 	setup_menuitem_with_icon (item, panel_menu_icon_get_size (),
@@ -312,7 +313,7 @@ panel_menu_items_create_action_item_full (PanelActionButtonType  action_type,
 	if (panel_action_get_is_disabled (action_type))
 		return NULL;
 
-	item = gtk_image_menu_item_new ();
+	item = mate_image_menu_item_new ();
         setup_menuitem_with_icon (item,
 				  panel_menu_icon_get_size (),
 				  NULL,
@@ -458,7 +459,7 @@ panel_place_menu_item_append_gtk_bookmarks (GtkWidget *menu, guint max_items_or_
 	} else {
 		GtkWidget *item;
 
-		item = gtk_image_menu_item_new ();
+		item = mate_image_menu_item_new ();
 		setup_menuitem_with_icon (item, panel_menu_icon_get_size (),
 					  NULL, PANEL_ICON_BOOKMARKS,
 					  _("Bookmarks"));
@@ -905,7 +906,7 @@ panel_place_menu_item_append_local_gio (PanelPlaceMenuItem *place_item,
 	} else {
 		GtkWidget  *menu_item;
 
-		menu_item = gtk_image_menu_item_new ();
+		menu_item = mate_image_menu_item_new ();
 		setup_menuitem_with_icon (menu_item, panel_menu_icon_get_size (),
 		                          NULL,
 		                          PANEL_ICON_REMOVABLE_MEDIA,
diff --git a/mate-panel/panel-recent.c b/mate-panel/panel-recent.c
index 69b92c93..2ed4715e 100644
--- a/mate-panel/panel-recent.c
+++ b/mate-panel/panel-recent.c
@@ -30,6 +30,8 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
+#include <libmate-desktop/mate-image-menu-item.h>
+
 #include <libpanel-util/panel-error.h>
 #include <libpanel-util/panel-show.h>
 #include <libpanel-util/panel-gtk.h>
@@ -192,7 +194,7 @@ panel_recent_append_documents_menu (GtkWidget        *top_menu,
 	GtkWidget      *menu_item;
 	int             size;
 
-	menu_item = gtk_image_menu_item_new ();
+	menu_item = mate_image_menu_item_new ();
 	setup_menuitem_with_icon (menu_item,
 				  panel_menu_icon_get_size (),
 				  NULL,
@@ -234,7 +236,7 @@ panel_recent_append_documents_menu (GtkWidget        *top_menu,
 
 	add_menu_separator (recent_menu);
 
-	menu_item = gtk_image_menu_item_new ();
+	menu_item = mate_image_menu_item_new ();
 	setup_menuitem_with_icon (menu_item,
 				   panel_menu_icon_get_size (),
 				   NULL,
-- 
cgit v1.2.1