From 3199439ed87d9add54ab21935a713693e7c17919 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Thu, 14 Aug 2008 20:49:37 +0000 Subject: [PATCH] fix against efreet API breakage SVN revision: 35492 --- src/bin/e_border.c | 2 +- src/bin/e_configure.c | 4 ++-- src/bin/e_eap_editor.c | 4 ++-- src/bin/e_fm.c | 8 ++++---- src/bin/e_int_border_menu.c | 4 ++-- src/bin/e_int_menus.c | 10 +++++----- src/bin/e_module.c | 2 +- src/bin/e_slidecore.c | 4 ++-- src/bin/e_utils.c | 6 +++--- src/bin/e_utils.h | 6 +++--- src/modules/conf_applications/e_int_config_apps.c | 10 +++++----- src/modules/conf_icon_theme/e_int_config_icon_themes.c | 4 ++-- src/modules/conf_imc/e_int_config_imc.c | 2 +- src/modules/exebuf/e_exebuf.c | 8 ++++---- src/modules/fileman/e_fwin.c | 4 ++-- src/modules/ibar/e_mod_main.c | 10 +++++----- 16 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/bin/e_border.c b/src/bin/e_border.c index ca8c9fc7c..4da452dc9 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -2798,7 +2798,7 @@ e_border_icon_add(E_Border *bd, Evas *evas) { if ((bd->desktop) && (bd->icon_preference != E_ICON_PREF_NETWM)) { - o = e_util_desktop_icon_add(bd->desktop, "24x24", evas); + o = e_util_desktop_icon_add(bd->desktop, 24, evas); if (o) return o; } diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index c58a73408..77e1c0466 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -103,7 +103,7 @@ _e_configure_efreet_desktop_update(void) cfg_cat_icon = strdup(cfg_cat_icon); else cfg_cat_icon = efreet_icon_path_find(e_config->icon_theme, - cfg_cat_icon, "64x64"); + cfg_cat_icon, 64); } } if (desktop->icon) @@ -112,7 +112,7 @@ _e_configure_efreet_desktop_update(void) cfg_icon = strdup(desktop->icon); else cfg_icon = efreet_icon_path_find(e_config->icon_theme, - desktop->icon, "64x64"); + desktop->icon, 64); } if (desktop->name) label = desktop->name; else if (desktop->generic_name) label = desktop->generic_name; diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c index f96d3d049..b873cd8dd 100644 --- a/src/bin/e_eap_editor.c +++ b/src/bin/e_eap_editor.c @@ -567,7 +567,7 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2) if (ecore_file_exists(cfdata->icon)) icon_path = strdup(cfdata->icon); else - icon_path = efreet_icon_path_find(e_config->icon_theme, cfdata->icon, "scalable"); + icon_path = efreet_icon_path_find(e_config->icon_theme, cfdata->icon, 64); if (icon_path) { @@ -721,7 +721,7 @@ _e_desktop_editor_icon_update(E_Config_Dialog_Data *cfdata) Evas_Object *o; if (!cfdata->editor->img_widget) return; - o = e_util_icon_theme_icon_add(cfdata->icon, "32x32", cfdata->editor->evas); + o = e_util_icon_theme_icon_add(cfdata->icon, 32, cfdata->editor->evas); /* NB this takes care of freeing any previous icon object */ e_widget_button_icon_set(cfdata->editor->img_widget, o); diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index c8b83811e..71926817f 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -1201,7 +1201,7 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(ic->info.fm), ic->info.file); ef = efreet_desktop_new(buf); - if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas); + if (ef) oic = e_util_desktop_icon_add(ef, 48, evas); if (type_ret) *type_ret = "DESKTOP"; if (ef) efreet_desktop_free(ef); } @@ -1278,7 +1278,7 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, oic = NULL; snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath, ic->info.file); ef = efreet_desktop_new(buf); - if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas); + if (ef) oic = e_util_desktop_icon_add(ef, 48, evas); if (type_ret) *type_ret = "DESKTOP"; if (ef) efreet_desktop_free(ef); } @@ -1350,7 +1350,7 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, oic = NULL; ef = efreet_desktop_new(buf); - if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas); + if (ef) oic = e_util_desktop_icon_add(ef, 48, evas); if (type_ret) *type_ret = "DESKTOP"; if (ef) efreet_desktop_free(ef); } @@ -1372,7 +1372,7 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, Efreet_Desktop *desktop; desktop = efreet_util_desktop_exec_find(imc->e_im_setup_exec); if (desktop) - oic = e_util_desktop_icon_add(desktop, "24x24", evas); + oic = e_util_desktop_icon_add(desktop, 24, evas); } e_intl_input_method_config_free(imc); } diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c index 9bde10aab..7b6c73957 100644 --- a/src/bin/e_int_border_menu.c +++ b/src/bin/e_int_border_menu.c @@ -70,7 +70,7 @@ e_int_border_menu_create(E_Border *bd) 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_util_desktop_menu_item_icon_add(bd->desktop, "16x16", mi); + e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi); mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Add Application...")); @@ -922,7 +922,7 @@ _e_border_menu_cb_border_pre(void *data, E_Menu *m, E_Menu_Item *mi) e_menu_item_radio_set(submi, 1); e_menu_item_radio_group_set(submi, 2); e_menu_item_toggle_set(submi, (bd->icon_preference == E_ICON_PREF_USER ? 1 : 0)); - e_util_desktop_menu_item_icon_add(bd->desktop, "16x16", submi); + e_util_desktop_menu_item_icon_add(bd->desktop, 16, submi); e_menu_item_callback_set(submi, _e_border_menu_cb_iconpref_user, bd); } diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index ae2cf999a..9509f3f4e 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -584,7 +584,7 @@ _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu) char *file; file = efreet_icon_path_find(e_config->icon_theme, - entry->icon, "24x24"); + entry->icon, 24); e_menu_item_icon_file_set(mi, file); E_FREE(file); } @@ -707,15 +707,15 @@ _e_int_menus_apps_drag(void *data, E_Menu *m, E_Menu_Item *mi) E_Drag *drag; Evas_Object *o = NULL; Evas_Coord x, y, w, h; + unsigned int size; const char *drag_types[] = { "enlightenment/desktop" }; - char buf[128]; evas_object_geometry_get(mi->icon_object, &x, &y, &w, &h); drag = e_drag_new(m->zone->container, x, y, drag_types, 1, desktop, -1, NULL, NULL); - snprintf(buf, sizeof(buf), "%dx%d", w, h); - o = e_util_desktop_icon_add(desktop, buf, e_drag_evas_get(drag)); + size = MAX(w, h); + o = e_util_desktop_icon_add(desktop, size, e_drag_evas_get(drag)); e_drag_object_set(drag, o); e_drag_resize(drag, w, h); e_drag_start(drag, mi->drag.x + w, mi->drag.y + h); @@ -1425,7 +1425,7 @@ _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m) e_object_ref(E_OBJECT(bd)); e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd); if (bd->desktop) - e_util_desktop_menu_item_icon_add(bd->desktop, "24x24", mi); + e_util_desktop_menu_item_icon_add(bd->desktop, 24, mi); } e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_lost_clients_free_hook); diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 1f0b2e527..829f470b5 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -397,7 +397,7 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body) desktop = efreet_desktop_get(buf); if ((desktop) && (desktop->icon)) { - icon = efreet_icon_path_find(e_config->icon_theme, desktop->icon, "64x64"); + icon = efreet_icon_path_find(e_config->icon_theme, desktop->icon, 64); if (!icon) { snprintf(buf, sizeof(buf), "%s/%s.edj", diff --git a/src/bin/e_slidecore.c b/src/bin/e_slidecore.c index 82d2d9092..fd57a6de1 100644 --- a/src/bin/e_slidecore.c +++ b/src/bin/e_slidecore.c @@ -231,7 +231,7 @@ _e_smart_reconfigure(E_Smart_Data *sd) it2 = evas_list_nth(sd->items, pl2); if (it1 && it2) { - sd->o1 = e_util_icon_theme_icon_add(it1->icon, "512x512", + sd->o1 = e_util_icon_theme_icon_add(it1->icon, 512, evas_object_evas_get(sd->smart_obj)); if (sd->o1) { @@ -243,7 +243,7 @@ _e_smart_reconfigure(E_Smart_Data *sd) evas_object_clip_set(sd->o1, evas_object_clip_get(sd->smart_obj)); evas_object_show(sd->o1); } - sd->o2 = e_util_icon_theme_icon_add(it2->icon, "512x512", + sd->o2 = e_util_icon_theme_icon_add(it2->icon, 512, evas_object_evas_get(sd->smart_obj)); if (sd->o2) { diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index 0c1e0da41..0e80889dd 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -862,7 +862,7 @@ e_util_icon_add(const char *path, Evas *evas) } EAPI Evas_Object * -e_util_desktop_icon_add(Efreet_Desktop *desktop, const char *size, Evas *evas) +e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas) { if ((!desktop) || (!desktop->icon)) return NULL; @@ -870,7 +870,7 @@ e_util_desktop_icon_add(Efreet_Desktop *desktop, const char *size, Evas *evas) } EAPI Evas_Object * -e_util_icon_theme_icon_add(const char *icon_name, const char *size, Evas *evas) +e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas) { if (!icon_name) return NULL; if (icon_name[0] == '/') return e_util_icon_add(icon_name, evas); @@ -891,7 +891,7 @@ e_util_icon_theme_icon_add(const char *icon_name, const char *size, Evas *evas) } EAPI void -e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, const char *size, E_Menu_Item *mi) +e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, unsigned int size, E_Menu_Item *mi) { char *path = NULL; diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h index 6aab0df66..dcf688617 100644 --- a/src/bin/e_utils.h +++ b/src/bin/e_utils.h @@ -49,9 +49,9 @@ EAPI char *e_util_file_time_get(time_t ftime); EAPI void e_util_library_path_strip(void); EAPI void e_util_library_path_restore(void); EAPI Evas_Object *e_util_icon_add(const char *path, Evas *evas); -EAPI Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, const char *size, Evas *evas); -EAPI Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, const char *size, Evas *evas); -EAPI void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, const char *size, E_Menu_Item *mi); +EAPI Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas); +EAPI Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas); +EAPI void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, unsigned int size, E_Menu_Item *mi); EAPI int e_util_dir_check(const char *dir); EAPI void e_util_defer_object_del(E_Object *obj); EAPI const char *e_util_winid_str_get(Ecore_X_Window win); diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c index 7e93e6542..f20a8d126 100644 --- a/src/modules/conf_applications/e_int_config_apps.c +++ b/src/modules/conf_applications/e_int_config_apps.c @@ -378,7 +378,7 @@ _fill_apps(E_Config_Dialog_Data *cfdata) { Evas_Object *icon = NULL; - icon = e_util_desktop_icon_add(desk, "24x24", evas); + icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append(cfdata->o_all, icon, desk->name, _all_list_cb_selected, cfdata, desk->orig_path); } @@ -413,7 +413,7 @@ _fill_list(E_Config_Dialog_Data *cfdata) { Evas_Object *icon = NULL; - icon = e_util_desktop_icon_add(desk, "24x24", evas); + icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append(cfdata->o_sel, icon, desk->name, _sel_list_cb_selected, cfdata, desk->orig_path); } @@ -525,7 +525,7 @@ _cb_add(void *data, void *data2) if (!lbl) continue; desk = efreet_util_desktop_name_find(lbl); if (!desk) continue; - icon = e_util_desktop_icon_add(desk, "24x24", evas); + icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append(cfdata->o_sel, icon, desk->name, _sel_list_cb_selected, cfdata, desk->orig_path); } @@ -594,7 +594,7 @@ _cb_up(void *data, void *data2) { e_widget_ilist_remove_num(cfdata->o_sel, sel); e_widget_ilist_go(cfdata->o_sel); - icon = e_util_desktop_icon_add(desk, "24x24", evas); + icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_prepend_relative(cfdata->o_sel, icon, desk->name, _sel_list_cb_selected, cfdata, desk->orig_path, (sel - 1)); @@ -634,7 +634,7 @@ _cb_down(void *data, void *data2) { e_widget_ilist_remove_num(cfdata->o_sel, sel); e_widget_ilist_go(cfdata->o_sel); - icon = e_util_desktop_icon_add(desk, "24x24", evas); + icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append_relative(cfdata->o_sel, icon, desk->name, _sel_list_cb_selected, cfdata, desk->orig_path, sel); diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.c b/src/modules/conf_icon_theme/e_int_config_icon_themes.c index a26264789..5f5ae7120 100644 --- a/src/modules/conf_icon_theme/e_int_config_icon_themes.c +++ b/src/modules/conf_icon_theme/e_int_config_icon_themes.c @@ -183,7 +183,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data { char *path; - path = efreet_icon_path_find(theme->name.internal, theme->example_icon, "24x24"); + path = efreet_icon_path_find(theme->name.internal, theme->example_icon, 24); if (path) { oc = e_icon_add(evas); @@ -297,7 +297,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf { char *path; - path = efreet_icon_path_find(theme->name.internal, theme->example_icon, "24x24"); + path = efreet_icon_path_find(theme->name.internal, theme->example_icon, 24); if (path) { oc = e_icon_add(evas); diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c index 69765159a..ba96e3d43 100644 --- a/src/modules/conf_imc/e_int_config_imc.c +++ b/src/modules/conf_imc/e_int_config_imc.c @@ -353,7 +353,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf Efreet_Desktop *desktop; desktop = efreet_util_desktop_exec_find(imc->e_im_setup_exec); if (desktop) - icon = e_util_desktop_icon_add(desktop, "48x48", evas); + icon = e_util_desktop_icon_add(desktop, 48, evas); } e_widget_ilist_append(cfdata->gui.imc_basic_list, icon, imc->e_im_name, NULL, NULL, imc_path); diff --git a/src/modules/exebuf/e_exebuf.c b/src/modules/exebuf/e_exebuf.c index 21733c69b..a68590f2e 100644 --- a/src/modules/exebuf/e_exebuf.c +++ b/src/modules/exebuf/e_exebuf.c @@ -419,7 +419,7 @@ _e_exebuf_update(void) if (!desktop) desktop = efreet_util_desktop_generic_name_find(cmd_buf); if (desktop) { - o = e_util_desktop_icon_add(desktop, "24x24", exebuf->evas); + o = e_util_desktop_icon_add(desktop, 24, exebuf->evas); icon_object = o; edje_object_part_swallow(bg_object, "e.swallow.icons", o); evas_object_show(o); @@ -1053,7 +1053,7 @@ _e_exebuf_matches_update(void) evas_object_show(o); if (edje_object_part_exists(exe->bg_object, "e.swallow.icons")) { - o = e_util_desktop_icon_add(exe->desktop, "24x24", exebuf->evas); + o = e_util_desktop_icon_add(exe->desktop, 24, exebuf->evas); exe->icon_object = o; edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o); evas_object_show(o); @@ -1103,7 +1103,7 @@ _e_exebuf_matches_update(void) desktop = efreet_util_desktop_exec_find(exe->file); if (desktop) { - o = e_util_desktop_icon_add(desktop, "24x24", exebuf->evas); + o = e_util_desktop_icon_add(desktop, 24, exebuf->evas); exe->icon_object = o; edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o); evas_object_show(o); @@ -1157,7 +1157,7 @@ _e_exebuf_hist_update(void) desktop = efreet_util_desktop_exec_find(exe->file); if (desktop) { - o = e_util_desktop_icon_add(desktop, "24x24", exebuf->evas); + o = e_util_desktop_icon_add(desktop, 24, 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/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 6bcaa905e..e6ba24cda 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -1343,7 +1343,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Evas_List *files, int always) for (l = apps; l; l = l->next) { desk = l->data; - oi = e_util_desktop_icon_add(desk, "24x24", evas); + oi = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append(o, oi, desk->name, NULL, NULL, efreet_util_path_to_file_id(desk->orig_path)); } @@ -1383,7 +1383,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Evas_List *files, int always) desk = mlist->data; if (!desk) continue; - icon = e_util_desktop_icon_add(desk, "24x24", evas); + icon = e_util_desktop_icon_add(desk, 24, evas); e_widget_ilist_append(o, icon, desk->name, NULL, NULL, efreet_util_path_to_file_id(desk->orig_path)); } diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index e396bbcdd..062cd0d03 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -598,12 +598,12 @@ _ibar_icon_fill(IBar_Icon *ic) { /* TODO: Correct icon size! */ if (ic->o_icon) evas_object_del(ic->o_icon); - ic->o_icon = e_util_desktop_icon_add(ic->app, "48x48", evas_object_evas_get(ic->ibar->o_box)); + ic->o_icon = e_util_desktop_icon_add(ic->app, 48, 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); if (ic->o_icon2) evas_object_del(ic->o_icon2); - ic->o_icon2 = e_util_desktop_icon_add(ic->app, "48x48", evas_object_evas_get(ic->ibar->o_box)); + ic->o_icon2 = e_util_desktop_icon_add(ic->app, 48, 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); @@ -905,8 +905,8 @@ _ibar_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info E_Drag *d; Evas_Object *o; Evas_Coord x, y, w, h; + unsigned int size; const char *drag_types[] = { "enlightenment/desktop" }; - char buf[128]; ic->drag.dnd = 1; ic->drag.start = 0; @@ -915,8 +915,8 @@ _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, NULL, NULL); - snprintf(buf, sizeof(buf), "%dx%d", w, h); - o = e_util_desktop_icon_add(ic->app, buf, e_drag_evas_get(d)); + size = MAX(w, h); + o = e_util_desktop_icon_add(ic->app, size, e_drag_evas_get(d)); e_drag_object_set(d, o); e_drag_resize(d, w, h);