5 files changed, 20 insertions, 68 deletions
diff --git a/.build.yml b/.build.yml
index 212cf511..58ffc4ad 100644
--- a/.build.yml
+++ b/.build.yml
@@ -144,7 +144,7 @@ variables:
 -enable-checker alpha.unix.cstring.OutOfBounds
 -enable-checker alpha.core.FixedAddr
 -enable-checker security.insecureAPI.strcpy"'
- - MATE_DESKTOP_VERSION=1.27.1
+ - MATE_DESKTOP_VERSION=1.28.2
 
 before_scripts:
 
diff --git a/NEWS b/NEWS
index bad6d4e2..372cd54d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+### mate-panel 1.29.0
+
+### mate-panel 1.28.1
+
+ * Build: require mate-desktop 1.28.2
+ * [ci] use mate-desktop 1.28.2 upon which this depends
+ * Use MateImageMenuItem properly
+
+### mate-panel 1.28.0
+
+ * update translations
+
 ### mate-panel 1.27.3
 
 * update translations
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index a87649b1..93785cc1 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -71,8 +71,6 @@ typedef struct {
 gboolean needs_hints;
 #endif
 
- GtkIconTheme* icon_theme;
-
 /* Properties: */
 GtkWidget* properties_dialog;
 GtkWidget* wayland_info_label;
@@ -205,11 +203,6 @@ static void response_cb(GtkWidget* widget, int id, TasklistData* tasklist)
 }
 }
 
-static void applet_realized(MatePanelApplet* applet, TasklistData* tasklist)
-{
- tasklist->icon_theme = gtk_icon_theme_get_for_screen(gtk_widget_get_screen(tasklist->applet));
-}
-
 static void applet_change_orient(MatePanelApplet* applet, MatePanelAppletOrient orient, TasklistData* tasklist)
 {
 GtkOrientation new_orient;
@@ -781,55 +774,6 @@ static void applet_size_allocate(GtkWidget *widget, GtkAllocation *allocation, T
 mate_panel_applet_set_size_hints(MATE_PANEL_APPLET(tasklist->applet), size_hints, len, 0);
 }
 
-#ifdef HAVE_X11
-/* Currently only used on X11, but should work on Wayland as well when needed */
-static GdkPixbuf* icon_loader_func(const char* icon, int size, unsigned int flags, void* data)
-{
- TasklistData* tasklist;
- GdkPixbuf* retval;
- char* icon_no_extension;
- char* p;
-
- tasklist = data;
-
- if (icon == NULL || strcmp(icon, "") == 0)
- return NULL;
-
- if (g_path_is_absolute(icon))
- {
- if (g_file_test(icon, G_FILE_TEST_EXISTS))
- {
- return gdk_pixbuf_new_from_file_at_size(icon, size, size, NULL);
- }
- else
- {
- char* basename;
-
- basename = g_path_get_basename(icon);
- retval = icon_loader_func(basename, size, flags, data);
- g_free(basename);
-
- return retval;
- }
- }
-
- /* This is needed because some .desktop files have an icon name *and*
- * an extension as icon */
- icon_no_extension = g_strdup(icon);
- p = strrchr(icon_no_extension, '.');
-
- if (p && (strcmp(p, ".png") == 0 || strcmp(p, ".xpm") == 0 || strcmp(p, ".svg") == 0))
- {
- *p = 0;
- }
-
- retval = gtk_icon_theme_load_icon(tasklist->icon_theme, icon_no_extension, size, 0, NULL);
- g_free(icon_no_extension);
-
- return retval;
-}
-#endif /* HAVE_X11 */
-
 gboolean window_list_applet_fill(MatePanelApplet* applet)
 {
 TasklistData* tasklist;
@@ -898,8 +842,6 @@ gboolean window_list_applet_fill(MatePanelApplet* applet)
 {
 tasklist->tasklist = wnck_tasklist_new();
 
- wnck_tasklist_set_icon_loader(WNCK_TASKLIST(tasklist->tasklist), icon_loader_func, tasklist, NULL);
-
 #ifdef HAVE_WINDOW_PREVIEWS
 g_signal_connect (tasklist->tasklist, "task-enter-notify",
 G_CALLBACK (applet_enter_notify_event),
@@ -935,9 +877,6 @@ gboolean window_list_applet_fill(MatePanelApplet* applet)
 
 gtk_container_add(GTK_CONTAINER(tasklist->applet), tasklist->tasklist);
 
- g_signal_connect (tasklist->applet, "realize",
- G_CALLBACK (applet_realized),
- tasklist);
 g_signal_connect (tasklist->applet, "change-orient",
 G_CALLBACK (applet_change_orient),
 tasklist);
diff --git a/configure.ac b/configure.ac
index 748371c0..f0b45e2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mate-panel], [1.27.3], [https://github.com/mate-desktop/mate-panel/issues],
+AC_INIT([mate-panel], [1.29.0], [https://github.com/mate-desktop/mate-panel/issues],
 [mate-panel], [https://mate-desktop.org])
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar -Wno-portability check-news])
@@ -53,7 +53,7 @@ fi
 
 LT_LIB_M
 
-LIBMATE_DESKTOP_REQUIRED=1.27.1
+LIBMATE_DESKTOP_REQUIRED=1.28.2
 GDK_PIXBUF_REQUIRED=2.26.0
 PANGO_REQUIRED=1.15.4
 GLIB_REQUIRED=2.50.0
diff --git a/mate-panel/panel-menu-items.h b/mate-panel/panel-menu-items.h
index 1b94a2d8..2e4e4af1 100644
--- a/mate-panel/panel-menu-items.h
+++ b/mate-panel/panel-menu-items.h
@@ -26,6 +26,7 @@
 
 #include <gtk/gtk.h>
 #include "panel-widget.h"
+#include <libmate-desktop/mate-image-menu-item.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,13 +44,13 @@ typedef struct _PanelPlaceMenuItemClass PanelPlaceMenuItemClass;
 typedef struct _PanelPlaceMenuItemPrivate PanelPlaceMenuItemPrivate;
 
 struct _PanelPlaceMenuItem {
- GtkImageMenuItem menuitem;
+ MateImageMenuItem menuitem;
 
 PanelPlaceMenuItemPrivate *priv;
 };
 
 struct _PanelPlaceMenuItemClass {
- GtkImageMenuItemClass menuitem_class;
+ MateImageMenuItemClass menuitem_class;
 };
 
 GType panel_place_menu_item_get_type (void) G_GNUC_CONST;
@@ -66,13 +67,13 @@ typedef struct _PanelDesktopMenuItemClass PanelDesktopMenuItemClass;
 typedef struct _PanelDesktopMenuItemPrivate PanelDesktopMenuItemPrivate;
 
 struct _PanelDesktopMenuItem{
- GtkImageMenuItem menuitem;
+ MateImageMenuItem menuitem;
 
 PanelDesktopMenuItemPrivate *priv;
 };
 
 struct _PanelDesktopMenuItemClass {
- GtkImageMenuItemClass menuitem_class;
+ MateImageMenuItemClass menuitem_class;
 };
 
 GType panel_desktop_menu_item_get_type (void) G_GNUC_CONST;