From c57c2c40d5d6b1cfbab1978cba9c785b0d70f888 Mon Sep 17 00:00:00 2001 From: monsta Date: Tue, 23 May 2017 18:34:55 +0300 Subject: menu: fix crash when some .desktop file has empty Icon field fixes https://github.com/mate-desktop/mate-panel/issues/494 --- mate-panel/menu.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mate-panel/menu.c b/mate-panel/menu.c index fd2cccbd..05cba577 100644 --- a/mate-panel/menu.c +++ b/mate-panel/menu.c @@ -1177,14 +1177,12 @@ create_menuitem (GtkWidget *menu, if (matemenu_tree_entry_get_icon (entry) != NULL) { const char *icon; - char *icon_no_ext; + GIcon *gicon; icon = matemenu_tree_entry_get_icon (entry); - if (!g_path_is_absolute (icon)) { - icon_no_ext = panel_xdg_icon_remove_extension (icon); - gtk_drag_source_set_icon_name (menuitem, - icon_no_ext); - g_free (icon_no_ext); + gicon = panel_gicon_from_icon_name (icon); + if (gicon != NULL) { + gtk_drag_source_set_icon_gicon (menuitem, gicon); } } -- cgit v1.2.1