diff options
| author | raveit65 <[email protected]> | 2023-10-15 21:16:48 +0200 |
|---|---|---|
| committer | mouse <[email protected]> | 2023-10-20 11:23:39 +0800 |
| commit | ecc7815307afd7502f69267820971e5f550e42d4 (patch) | |
| tree | 226a9e85ad3ad94f5163a097a267cc5da3001442 | |
| parent | 863aaf7fb0f391bf1f7a31c55d298eedcc53c1fc (diff) | |
| download | mate-settings-daemon-ecc7815307afd7502f69267820971e5f550e42d4.tar.bz2 mate-settings-daemon-ecc7815307afd7502f69267820971e5f550e42d4.tar.xz | |
replace deprecated gtk_image_menu_item*
| -rw-r--r-- | .build.yml | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/keyboard/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/keyboard/msd-keyboard-xkb.c | 8 |
4 files changed, 8 insertions, 6 deletions
@@ -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); |