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:
flip bar dirs correctly :)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- e_mod_main.c 10 May 2006 07:42:39 -0000 1.115
+++ e_mod_main.c 10 May 2006 09:18:27 -0000 1.116
@@ -271,7 +271,7 @@
evas_object_del(b->o_box);
if (b->o_drop) evas_object_del(b->o_drop);
if (b->o_drop_over) evas_object_del(b->o_drop_over);
- e_object_unref(E_OBJECT(b->apps));
+ if (b->apps) e_object_unref(E_OBJECT(b->apps));
e_app_change_callback_del(_ibar_cb_app_change, b);
free(b);
}
@@ -387,7 +387,8 @@
evas_stringshare_del(inst->dir);
inst->dir = evas_stringshare_add(ci->dir);
_ibar_empty(inst->ibar);
- e_object_unref(E_OBJECT(inst->ibar->apps));
+ if (inst->ibar->apps)
+ e_object_unref(E_OBJECT(inst->ibar->apps));
if (inst->dir[0] != '/')
{
char *homedir;
@@ -395,7 +396,7 @@
homedir = e_user_homedir_get();
if (homedir)
{
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/%s",
homedir, inst->dir);
+ snprintf(buf, sizeof(buf),
"%s/.e/e/applications/bar/%s", homedir, inst->dir);
free(homedir);
}
}
@@ -535,6 +536,7 @@
IBar *b;
b = data;
+ if (!b->apps) return;
switch (ch)
{
case E_APP_ADD:
@@ -1115,10 +1117,13 @@
else
{
atend:
- if (app)
- e_app_list_append(app, inst->ibar->apps);
- else if (l)
- e_app_files_list_append(l, inst->ibar->apps);
+ if (inst->ibar->apps)
+ {
+ if (app)
+ e_app_list_append(app, inst->ibar->apps);
+ else if (l)
+ e_app_files_list_append(l, inst->ibar->apps);
+ }
}
evas_object_del(inst->ibar->o_drop);
-------------------------------------------------------
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
