From ecc7815307afd7502f69267820971e5f550e42d4 Mon Sep 17 00:00:00 2001
From: raveit65 <mate@raveit.de>
Date: Sun, 15 Oct 2023 21:16:48 +0200
Subject: replace deprecated gtk_image_menu_item*

---
 .build.yml                          | 2 +-
 configure.ac                        | 2 +-
 plugins/keyboard/Makefile.am        | 2 ++
 plugins/keyboard/msd-keyboard-xkb.c | 8 ++++----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.build.yml b/.build.yml
index 523a87b..5417351 100644
--- a/.build.yml
+++ b/.build.yml
@@ -130,7 +130,7 @@ variables:
     -enable-checker alpha.unix.cstring.OutOfBounds
     -enable-checker alpha.core.FixedAddr
     -enable-checker security.insecureAPI.strcpy"'
-  - MATE_DESKTOP_VERSION=1.25.0
+  - MATE_DESKTOP_VERSION=1.27.1
 
 before_scripts:
   - if [ ${DISTRO_NAME} == "debian" ];then
diff --git a/configure.ac b/configure.ac
index 11ba2b4..7ac572d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ DBUS_GLIB_REQUIRED_VERSION=0.74
 GLIB_REQUIRED_VERSION=2.58.0
 GIO_REQUIRED_VERSION=2.50.0
 GTK_REQUIRED_VERSION=3.22.0
-MATE_DESKTOP_REQUIRED_VERSION=1.25.0
+MATE_DESKTOP_REQUIRED_VERSION=1.27.1
 LIBMATEKBD_REQUIRED_VERSION=1.17.0
 LIBNOTIFY_REQUIRED_VERSION=0.7.0
 LIBATSPI_REQUIRED_VERSION=2.0
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index f8ee695..2e2b83e 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -33,6 +33,7 @@ libkeyboard_la_CPPFLAGS = \
 libkeyboard_la_CFLAGS =			\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(LIBMATEKBDUI_CFLAGS)		\
+	$(MATE_DESKTOP_CFLAGS)		\
 	$(AM_CFLAGS)			\
 	$(WARN_CFLAGS)			\
 	$(NULL)
@@ -44,6 +45,7 @@ libkeyboard_la_LDFLAGS = 	\
 libkeyboard_la_LIBADD  = 	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(LIBMATEKBDUI_LIBS)	\
+	$(MATE_DESKTOP_LIBS)	\
 	$(NULL)
 
 plugin_in_files = 		\
diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c
index 31fc298..4373023 100644
--- a/plugins/keyboard/msd-keyboard-xkb.c
+++ b/plugins/keyboard/msd-keyboard-xkb.c
@@ -32,6 +32,8 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
+#include <libmate-desktop/mate-image-menu-item.h>
+
 #include <libmatekbd/matekbd-status.h>
 #include <libmatekbd/matekbd-keyboard-drawing.h>
 #include <libmatekbd/matekbd-desktop-config.h>
@@ -314,13 +316,11 @@ status_icon_popup_menu_cb (GtkStatusIcon *status_icon,
 			GtkWidget *img =
 			    gtk_image_new_from_pixbuf (pixbuf);
 			item =
-			    gtk_image_menu_item_new_with_label
+			    mate_image_menu_item_new_with_label
 			    (*current_name);
 			gtk_widget_show (img);
-			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM
+			mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM
 						       (item), img);
-			gtk_image_menu_item_set_always_show_image
-			    (GTK_IMAGE_MENU_ITEM (item), TRUE);
 			g_free (image_file);
 		}
 		gtk_widget_show (item);
-- 
cgit v1.2.1