From f66e16178cfefc529e521d9242c75d101f0c3163 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 20 Jul 2012 06:53:52 +0000 Subject: [PATCH] in general, any time e_icon_object_set is used, it's wrong. e_icon doesn't handle these cases and fails in every case other than the initial _set() call. SVN revision: 74209 --- src/bin/e_gadcon.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index d725e601e..bd06f1331 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -2916,14 +2916,9 @@ _e_gadcon_client_cb_menu_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) if (!(gcc = data)) return; if (gcc->client_class->func.icon) { - Evas_Object *ic; - - // e menu ASSUMES... EXPECTS the icon to be an.... e_icon! make it so. - ic = gcc->client_class->func.icon - ((E_Gadcon_Client_Class *)gcc->client_class, - mi->menu->evas); - mi->icon_object = e_icon_add(mi->menu->evas); - e_icon_object_set(mi->icon_object, ic); + // e menu ASSUMES... EXPECTS the icon to be an.... e_icon! + // if it's not, spankies for whoever wrote the icon callback! + mi->icon_object = gcc->client_class->func.icon ((E_Gadcon_Client_Class *)gcc->client_class, mi->menu->evas); } else e_util_menu_item_theme_icon_set(mi, "preferences-gadget"); // FIXME: Needs icon in theme