Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
ibox makes it first gadcon moves.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- e_mod_main.c 14 May 2006 01:30:10 -0000 1.119
+++ e_mod_main.c 18 May 2006 06:30:33 -0000 1.120
@@ -89,6 +89,7 @@
static void _ibar_icon_free(IBar_Icon *ic);
static void _ibar_icon_fill(IBar_Icon *ic);
static void _ibar_icon_empty(IBar_Icon *ic);
+static void _ibar_icon_signal_emit(IBar_Icon *ic, char *sig, char *src);
static void _ibar_cb_app_change(void *data, E_App *a, E_App_Change ch);
static int _ibar_cb_timer_drop_recalc(void *data);
static void _ibar_cb_obj_moveresize(void *data, Evas *e, Evas_Object *obj,
void *event_info);
@@ -599,18 +600,23 @@
static void
_ibar_icon_empty(IBar_Icon *ic)
{
- evas_object_del(ic->o_icon);
- evas_object_del(ic->o_icon2);
+ if (ic->o_icon) evas_object_del(ic->o_icon);
+ if (ic->o_icon2) evas_object_del(ic->o_icon2);
ic->o_icon = NULL;
+ ic->o_icon2 = NULL;
}
static void
_ibar_icon_signal_emit(IBar_Icon *ic, char *sig, char *src)
{
- edje_object_signal_emit(ic->o_holder, sig, src);
- edje_object_signal_emit(ic->o_icon, sig, src);
- edje_object_signal_emit(ic->o_holder2, sig, src);
- edje_object_signal_emit(ic->o_icon2, sig, src);
+ if (ic->o_holder)
+ edje_object_signal_emit(ic->o_holder, sig, src);
+ if (ic->o_icon)
+ edje_object_signal_emit(ic->o_icon, sig, src);
+ if (ic->o_holder2)
+ edje_object_signal_emit(ic->o_holder2, sig, src);
+ if (ic->o_icon2)
+ edje_object_signal_emit(ic->o_icon2, sig, src);
}
static void
@@ -1220,6 +1226,7 @@
inst->ibar->o_drop = NULL;
evas_object_del(inst->ibar->o_drop_over);
inst->ibar->o_drop_over = NULL;
+ _ibar_empty_handle(inst->ibar);
_ibar_resize_handle(inst->ibar);
_gc_orient(inst->gcc);
}
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
