summaryrefslogtreecommitdiff
path: root/plugins/keyboard
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2023-10-15 21:16:48 +0200
committermouse <[email protected]>2023-10-20 11:23:39 +0800
commitecc7815307afd7502f69267820971e5f550e42d4 (patch)
tree226a9e85ad3ad94f5163a097a267cc5da3001442 /plugins/keyboard
parent863aaf7fb0f391bf1f7a31c55d298eedcc53c1fc (diff)
downloadmate-settings-daemon-ecc7815307afd7502f69267820971e5f550e42d4.tar.bz2
mate-settings-daemon-ecc7815307afd7502f69267820971e5f550e42d4.tar.xz
replace deprecated gtk_image_menu_item*
Diffstat (limited to 'plugins/keyboard')
-rw-r--r--plugins/keyboard/Makefile.am2
-rw-r--r--plugins/keyboard/msd-keyboard-xkb.c8
2 files changed, 6 insertions, 4 deletions
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);