Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_int_config_apps.c
Log Message:
parameter type should be void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -3 -r1.539 -r1.540
--- e_border.c 5 Sep 2006 14:44:27 -0000 1.539
+++ e_border.c 6 Sep 2006 08:44:29 -0000 1.540
@@ -2546,27 +2546,29 @@
{
a = e_app_new(bd->internal_icon, 0);
if (a)
- {
- /* Free the aborted object first. */
- if (o) evas_object_del(o);
- o = e_app_icon_add(evas, a);
- bd->app = a;
- e_object_ref(E_OBJECT(bd->app));
- }
+ {
+ /* Free the aborted object first. */
+ if (o) evas_object_del(o);
+ o = e_app_icon_add(evas, a);
+ bd->app = a;
+ e_object_ref(E_OBJECT(bd->app));
+ }
else
- {
- if ((!strcmp(bd->internal_icon + strlen(bd->internal_icon) -
4, ".eap"))
- || (!strcmp(bd->internal_icon + strlen(bd->internal_icon) -
4, ".edj")))
- {
- if (!edje_object_file_set(o, bd->internal_icon, "icon"))
- e_util_edje_icon_set(o, "enlightenment/e");
- }
- else
- {
- if (!e_util_edje_icon_set(o, bd->internal_icon))
- e_util_edje_icon_set(o, "enlightenment/e");
- }
- }
+ {
+ char *ext;
+
+ ext = strrchr(bd->internal_icon, '.');
+ if ((ext) && ((!strcmp(ext, ".eap")) || (!strcmp(ext,
".edj"))))
+ {
+ if (!edje_object_file_set(o, bd->internal_icon, "icon"))
+ e_util_edje_icon_set(o, "enlightenment/e");
+ }
+ else
+ {
+ if (!e_util_edje_icon_set(o, bd->internal_icon))
+ e_util_edje_icon_set(o, "enlightenment/e");
+ }
+ }
}
return o;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_int_config_apps.c 4 Sep 2006 11:50:23 -0000 1.19
+++ e_int_config_apps.c 6 Sep 2006 08:44:30 -0000 1.20
@@ -198,7 +198,7 @@
}
static void
-_cb_editor_del(E_Object *obj)
+_cb_editor_del(void *obj)
{
E_Config_Dialog_Data *cfdata;
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
