From e2d14dc0a0a07e8d7b06b1ccd918fea44afcb7c6 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Fri, 18 Aug 2006 23:45:06 +0000 Subject: [PATCH] Now uses e_app_icon_add() to add the icon, thus it will keep up in the future with any changes in the way icons are added. SVN revision: 24888 --- src/modules/ibar/e_mod_main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 6d0bd1cfc..ad90226b0 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -607,13 +607,11 @@ _ibar_icon_free(IBar_Icon *ic) static void _ibar_icon_fill(IBar_Icon *ic) { - ic->o_icon = edje_object_add(evas_object_evas_get(ic->ibar->o_box)); - edje_object_file_set(ic->o_icon, ic->app->path, "icon"); + ic->o_icon = e_app_icon_add(evas_object_evas_get(ic->ibar->o_box), ic->app); edje_object_part_swallow(ic->o_holder, "item", ic->o_icon); evas_object_pass_events_set(ic->o_icon, 1); evas_object_show(ic->o_icon); - ic->o_icon2 = edje_object_add(evas_object_evas_get(ic->ibar->o_box)); - edje_object_file_set(ic->o_icon2, ic->app->path, "icon"); + ic->o_icon2 = e_app_icon_add(evas_object_evas_get(ic->ibar->o_box), ic->app); edje_object_part_swallow(ic->o_holder2, "item", ic->o_icon2); evas_object_pass_events_set(ic->o_icon2, 1); evas_object_show(ic->o_icon2); @@ -973,8 +971,7 @@ _ibar_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info d = e_drag_new(ic->ibar->inst->gcc->gadcon->zone->container, x, y, drag_types, 1, ic->app, -1, _ibar_cb_drag_finished); - o = edje_object_add(e_drag_evas_get(d)); - edje_object_file_set(o, ic->app->path, "icon"); + o = e_app_icon_add(e_drag_evas_get(d), ic->app); e_drag_object_set(d, o); e_drag_resize(d, w, h);