Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c
Log Message:
Now showing .desktop icons. Although the virtual .order displays have
something dodgy. To be investigated later when raster isn't piling more
urgent work and deadlines on me.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_fm.c 1 Sep 2006 13:12:39 -0000 1.49
+++ e_fm.c 3 Sep 2006 10:31:21 -0000 1.50
@@ -1647,6 +1647,30 @@
edje_object_part_swallow(ic->obj, "e.swallow.icon",
ic->obj_icon);
evas_object_show(ic->obj_icon);
}
+ else if (
+ (e_util_glob_case_match(ic->info.file, "*.desktop"))
+ )
+ {
+ E_App *app;
+
+ if (ic->info.pseudo_link)
+ {
+ /* FIXME: first one should be correct I think, but it
isn't. */
+// snprintf(buf, sizeof(buf), "%s/%s", ic->info.link,
ic->info.file);
+ snprintf(buf, sizeof(buf), "%s", ic->info.link);
+ }
+ else
+ snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath,
ic->info.file);
+//printf("ICON FOR APP (%s) %s - %s - %s - %s\n",
((ic->info.pseudo_link) ? "pseudo" : "real" ), buf, ic->info.link,
ic->info.file, ic->sd->realpath);
+ app = e_app_new(buf, 0);
+ if (app)
+ {
+ ic->obj_icon =
e_app_icon_add(evas_object_evas_get(ic->sd->obj), app);
+ e_object_unref(E_OBJECT(app));
+ }
+ edje_object_part_swallow(ic->obj, "e.swallow.icon",
ic->obj_icon);
+ evas_object_show(ic->obj_icon);
+ }
else
{
ic->obj_icon =
edje_object_add(evas_object_evas_get(ic->sd->obj));
@@ -1730,10 +1754,6 @@
if (desktop->name) ic->info.label =
evas_stringshare_add(desktop->name);
if (desktop->generic) ic->info.generic =
evas_stringshare_add(desktop->generic);
if (desktop->comment) ic->info.comment =
evas_stringshare_add(desktop->comment);
-
- if (desktop->file) ic->info.link =
_e_fm2_icon_desktop_url_eval(desktop->file);
- if (desktop->URL) ic->info.link =
_e_fm2_icon_desktop_url_eval(desktop->URL);
- if (desktop->path) ic->info.link =
_e_fm2_icon_desktop_url_eval(desktop->path);
if (desktop->icon)
{
-------------------------------------------------------------------------
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
