diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c index 73e91541a..6c63d2c97 100644 --- a/src/bin/e_apps.c +++ b/src/bin/e_apps.c @@ -2222,7 +2222,7 @@ _e_app_icon_type(E_App *a) } EAPI Evas_Object * -e_app_icon_add(Evas *evas, E_App *a) +e_app_icon_add(E_App *a, Evas *evas) { Evas_Object *o = NULL; E_App_Icon_Type type; @@ -2281,7 +2281,7 @@ printf("e_app_icon_add(%s) %s %s %s\n", a->path, a->icon_class, e_config-> */ EAPI void -e_app_icon_add_to_menu_item(E_Menu_Item *mi, E_App *a) +e_app_icon_add_to_menu_item(E_App *a, E_Menu_Item *mi) { E_App_Icon_Type type; diff --git a/src/bin/e_apps.h b/src/bin/e_apps.h index ab00a4929..912f9c14d 100644 --- a/src/bin/e_apps.h +++ b/src/bin/e_apps.h @@ -162,8 +162,8 @@ EAPI E_App *e_app_raw_new (void); EAPI Ecore_List *e_app_dir_file_list_get (E_App *a); EAPI void e_app_fields_empty (E_App *a); EAPI int e_app_valid_exe_get (E_App *a); -EAPI Evas_Object *e_app_icon_add (Evas *evas, E_App *a); -EAPI void e_app_icon_add_to_menu_item (E_Menu_Item *mi, E_App *a); +EAPI Evas_Object *e_app_icon_add (E_App *a, Evas *evas); +EAPI void e_app_icon_add_to_menu_item (E_App *a, E_Menu_Item *mi); #endif #endif diff --git a/src/bin/e_border.c b/src/bin/e_border.c index c949ffcab..ab1bb6534 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -2565,7 +2565,7 @@ e_border_icon_add(E_Border *bd, Evas *evas) { /* Free the aborted object first. */ if (o) evas_object_del(o); - o = e_app_icon_add(evas, a); + o = e_app_icon_add(a, evas); bd->app = a; e_object_ref(E_OBJECT(bd->app)); } @@ -2613,7 +2613,7 @@ e_border_icon_add(E_Border *bd, Evas *evas) } if (a) { - o = e_app_icon_add(evas, a); + o = e_app_icon_add(a, evas); bd->app = a; e_object_ref(E_OBJECT(bd->app)); } @@ -4708,24 +4708,7 @@ _e_border_cb_mouse_move(void *data, int type, void *event) bd->y + bd->fx.y + y, drag_types, 1, bd, -1, NULL); edje_object_file_get(bd->icon_object, &file, &part); - if ((file) && (part)) - { - o = edje_object_add(drag->evas); - edje_object_file_set(o, file, part); - } - else - { - int iw, ih; - void *data; - - data = e_icon_data_get(bd->icon_object, &iw, &ih); - if (data) - { - o = e_icon_add(drag->evas); - e_icon_data_set(o, data, iw, ih); - e_icon_alpha_set(o, 1); - } - } + o = e_border_icon_add(bd, drag->evas); if (!o) { /* FIXME: fallback icon for drag */ @@ -4737,9 +4720,6 @@ _e_border_cb_mouse_move(void *data, int type, void *event) e_drag_resize(drag, w, h); e_drag_start(drag, bd->drag.x, bd->drag.y); e_util_evas_fake_mouse_up_later(bd->bg_evas, 1); -// evas_event_feed_mouse_up(bd->bg_evas, 1, -// EVAS_BUTTON_NONE, ev->time, -// NULL); } bd->drag.start = 0; } diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c index d9461da8c..b84457010 100644 --- a/src/bin/e_eap_editor.c +++ b/src/bin/e_eap_editor.c @@ -586,5 +586,5 @@ _e_eap_editor_icon_show(E_Config_Dialog_Data *cfdata) cfdata->eap.icon_type = E_APP_ICON_PATH; else cfdata->eap.icon_type = E_APP_ICON_UNKNOWN; - cfdata->editor->img = e_app_icon_add(cfdata->editor->evas, &(cfdata->eap)); + cfdata->editor->img = e_app_icon_add(&(cfdata->eap), cfdata->editor->evas); } diff --git a/src/bin/e_exebuf.c b/src/bin/e_exebuf.c index 7394f8a36..1fc76c7f0 100644 --- a/src/bin/e_exebuf.c +++ b/src/bin/e_exebuf.c @@ -411,7 +411,7 @@ _e_exebuf_update(void) if (!a) a = e_app_generic_find(cmd_buf); if (a) { - o = e_app_icon_add(exebuf->evas, a); + o = e_app_icon_add(a, exebuf->evas); icon_object = o; edje_object_part_swallow(bg_object, "e.swallow.icons", o); evas_object_show(o); @@ -1019,7 +1019,7 @@ _e_exebuf_matches_update(void) evas_object_show(o); if (edje_object_part_exists(exe->bg_object, "e.swallow.icons")) { - o = e_app_icon_add(exebuf->evas, exe->app); + o = e_app_icon_add(exe->app, exebuf->evas); exe->icon_object = o; edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o); evas_object_show(o); @@ -1067,7 +1067,7 @@ _e_exebuf_matches_update(void) a = e_app_exe_find(exe->file); if (a) { - o = e_app_icon_add(exebuf->evas, a); + o = e_app_icon_add(a, exebuf->evas); exe->icon_object = o; edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o); evas_object_show(o); @@ -1120,7 +1120,7 @@ _e_exebuf_hist_update(void) a = e_app_exe_find(exe->file); if (a) { - o = e_app_icon_add(exebuf->evas, a); + o = e_app_icon_add(a, exebuf->evas); exe->icon_object = o; edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o); evas_object_show(o); diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index bf3f65454..a910e484a 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -2058,7 +2058,7 @@ _e_fm2_icon_icon_direct_set(E_Fm2_Icon *ic, Evas_Object *o, void (*gen_func) (vo app = e_app_new(buf, 0); if (app) { - oic = e_app_icon_add(evas_object_evas_get(o), app); + oic = e_app_icon_add(app, evas_object_evas_get(o)); e_object_unref(E_OBJECT(app)); } } @@ -2125,7 +2125,7 @@ _e_fm2_icon_icon_direct_set(E_Fm2_Icon *ic, Evas_Object *o, void (*gen_func) (vo app = e_app_new(buf, 0); if (app) { - oic = e_app_icon_add(evas_object_evas_get(o), app); + oic = e_app_icon_add(app, evas_object_evas_get(o)); e_object_unref(E_OBJECT(app)); } } diff --git a/src/bin/e_fwin.c b/src/bin/e_fwin.c index b6ec747f4..87121c305 100644 --- a/src/bin/e_fwin.c +++ b/src/bin/e_fwin.c @@ -795,7 +795,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Evas_List *files, int always) for (l = apps; l; l = l->next) { a = l->data; - oi = e_app_icon_add(evas, a); + oi = e_app_icon_add(a, evas); e_widget_ilist_append(o, oi, a->name, _e_fwin_cb_ilist_change, fad, ecore_file_get_file(a->path)); diff --git a/src/bin/e_init.c b/src/bin/e_init.c index d88f0d300..2405f2fb1 100644 --- a/src/bin/e_init.c +++ b/src/bin/e_init.c @@ -231,7 +231,7 @@ e_init_icons_app_add(E_App *app) evas_object_show(o); } - o = e_app_icon_add(_e_init_evas, app); + o = e_app_icon_add(app, _e_init_evas); evas_object_resize(o, _e_init_icon_size, _e_init_icon_size); e_box_pack_end(_e_init_icon_box, o); e_box_pack_options_set(o, diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c index c4e7be20a..bd8ac6aab 100644 --- a/src/bin/e_int_border_menu.c +++ b/src/bin/e_int_border_menu.c @@ -256,7 +256,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Edit Icon")); e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd); - e_app_icon_add_to_menu_item(mi, bd->app); + e_app_icon_add_to_menu_item(bd->app, mi); } else if (bd->client.icccm.class) /* icons with no class useless to borders */ { diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c index 72f191cc3..403491c4b 100644 --- a/src/bin/e_int_config_modules.c +++ b/src/bin/e_int_config_modules.c @@ -522,7 +522,7 @@ _fill_list(E_Config_Dialog_Data *cfdata) a = e_app_new(buf, 1); if (a) { - oc = e_app_icon_add(cfdata->evas, a); + oc = e_app_icon_add(a, cfdata->evas); e_widget_ilist_append(cfdata->gui.list, oc, a->name, NULL, NULL, cm->name); e_object_unref(E_OBJECT(a)); diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 862b37e73..8248866ab 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -556,7 +556,7 @@ _e_int_menus_apps_scan(E_Menu *m) else if (opt == 0x1) snprintf(label, sizeof(label), "%s", a->comment); else snprintf(label, sizeof(label), "%s", a->name); e_menu_item_label_set(mi, label); - e_app_icon_add_to_menu_item(mi, a); + e_app_icon_add_to_menu_item(a, mi); if (a->exe) { e_menu_item_callback_set(mi, _e_int_menus_apps_run, a); @@ -641,7 +641,7 @@ _e_int_menus_apps_drag(void *data, E_Menu *m, E_Menu_Item *mi) drag = e_drag_new(m->zone->container, x, y, drag_types, 1, a, -1, _e_int_menus_apps_drag_finished); - o = e_app_icon_add(e_drag_evas_get(drag), a); + o = e_app_icon_add(a, e_drag_evas_get(drag)); e_drag_object_set(drag, o); e_drag_resize(drag, w, h); e_object_ref(E_OBJECT(a)); @@ -1101,7 +1101,7 @@ _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m) // e_object_breadcrumb_add(E_OBJECT(bd), "lost_clients_menu"); e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd); a = bd->app; - if (a) e_app_icon_add_to_menu_item(mi, a); + if (a) e_app_icon_add_to_menu_item(a, mi); } e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_lost_clients_free_hook); e_object_data_set(E_OBJECT(m), borders); diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 058457718..0244ec5ae 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -382,7 +382,7 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body) app = e_app_new(eap, 0); if (app) { - dia->icon_object = e_app_icon_add(e_win_evas_get(dia->win), app); + dia->icon_object = e_app_icon_add(app, e_win_evas_get(dia->win)); edje_extern_object_min_size_set(dia->icon_object, 64, 64); edje_object_part_swallow(dia->bg_object, "e.swallow.icon", dia->icon_object); evas_object_show(dia->icon_object); diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 11c50a749..97387502c 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -596,11 +596,11 @@ _ibar_icon_free(IBar_Icon *ic) static void _ibar_icon_fill(IBar_Icon *ic) { - ic->o_icon = e_app_icon_add(evas_object_evas_get(ic->ibar->o_box), ic->app); + ic->o_icon = e_app_icon_add(ic->app, evas_object_evas_get(ic->ibar->o_box)); edje_object_part_swallow(ic->o_holder, "e.swallow.content", ic->o_icon); evas_object_pass_events_set(ic->o_icon, 1); evas_object_show(ic->o_icon); - ic->o_icon2 = e_app_icon_add(evas_object_evas_get(ic->ibar->o_box), ic->app); + ic->o_icon2 = e_app_icon_add(ic->app, evas_object_evas_get(ic->ibar->o_box)); edje_object_part_swallow(ic->o_holder2, "e.swallow.content", ic->o_icon2); evas_object_pass_events_set(ic->o_icon2, 1); evas_object_show(ic->o_icon2); @@ -990,7 +990,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 = e_app_icon_add(e_drag_evas_get(d), ic->app); + o = e_app_icon_add(ic->app, e_drag_evas_get(d)); e_drag_object_set(d, o); e_drag_resize(d, w, h);