Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
fix against efreet API breakage
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -3 -r1.191 -r1.192
--- e_mod_main.c 13 Dec 2007 13:25:10 -0000 1.191
+++ e_mod_main.c 14 Aug 2008 20:49:37 -0000 1.192
@@ -598,12 +598,12 @@
{
/* 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 @@
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 @@
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);
-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
