Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_configure.c e_eap_editor.c e_fm.c
e_int_border_menu.c e_int_menus.c e_module.c e_slidecore.c
e_utils.c e_utils.h
Log Message:
fix against efreet API breakage
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -3 -r1.654 -r1.655
--- e_border.c 11 Aug 2008 01:22:33 -0000 1.654
+++ e_border.c 14 Aug 2008 20:49:36 -0000 1.655
@@ -2798,7 +2798,7 @@
{
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- e_configure.c 19 Jun 2008 11:56:54 -0000 1.120
+++ e_configure.c 14 Aug 2008 20:49:36 -0000 1.121
@@ -103,7 +103,7 @@
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 @@
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- e_eap_editor.c 18 Jul 2008 10:05:25 -0000 1.97
+++ e_eap_editor.c 14 Aug 2008 20:49:36 -0000 1.98
@@ -567,7 +567,7 @@
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 @@
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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -3 -r1.247 -r1.248
--- e_fm.c 11 Aug 2008 02:13:22 -0000 1.247
+++ e_fm.c 14 Aug 2008 20:49:36 -0000 1.248
@@ -1201,7 +1201,7 @@
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 @@
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 @@
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 @@
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);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- e_int_border_menu.c 25 Jul 2008 21:32:28 -0000 1.85
+++ e_int_border_menu.c 14 Aug 2008 20:49:36 -0000 1.86
@@ -70,7 +70,7 @@
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_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);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -3 -r1.234 -r1.235
--- e_int_menus.c 11 Aug 2008 01:22:33 -0000 1.234
+++ e_int_menus.c 14 Aug 2008 20:49:36 -0000 1.235
@@ -584,7 +584,7 @@
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_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_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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- e_module.c 19 May 2008 04:37:34 -0000 1.89
+++ e_module.c 14 Aug 2008 20:49:36 -0000 1.90
@@ -397,7 +397,7 @@
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",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_slidecore.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_slidecore.c 27 Apr 2008 07:52:09 -0000 1.5
+++ e_slidecore.c 14 Aug 2008 20:49:36 -0000 1.6
@@ -231,7 +231,7 @@
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 @@
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)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- e_utils.c 19 May 2008 04:15:47 -0000 1.82
+++ e_utils.c 14 Aug 2008 20:49:36 -0000 1.83
@@ -862,7 +862,7 @@
}
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 @@
}
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 @@
}
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_utils.h 30 Oct 2007 20:01:41 -0000 1.41
+++ e_utils.h 14 Aug 2008 20:49:36 -0000 1.42
@@ -49,9 +49,9 @@
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);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
