Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_order.c
Log Message:
come back to me my ibar!!! come back! show me your icons honey!
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_order.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_order.c 25 Mar 2007 13:12:23 -0000 1.9
+++ e_order.c 30 Mar 2007 12:14:32 -0000 1.10
@@ -140,14 +140,16 @@
_e_order_read(E_Order *eo)
{
FILE *f;
+ char *dir;
eo->desktops = evas_list_free(eo->desktops);
if (!eo->path) return;
+ dir = ecore_file_get_dir(eo->path);
f = fopen(eo->path, "rb");
if (f)
{
- char buf[4096];
+ char buf[4096], buf2[PATH_MAX];
while (fgets(buf, sizeof(buf), f))
{
@@ -164,13 +166,29 @@
if (len > 0)
{
Efreet_Desktop *desktop;
- desktop = efreet_util_desktop_file_id_find(buf);
+
+ desktop = NULL;
+ if ((dir) && (buf[0] != '/'))
+ {
+ snprintf(buf2, sizeof(buf2), "%s/%s", dir, buf);
+ desktop = efreet_desktop_get(buf2);
+ }
+ if (!desktop)
+ {
+ snprintf(buf2, sizeof(buf2),
+ "%s/.e/e/applications/all/%s",
+ e_user_homedir_get(), buf);
+ desktop = efreet_desktop_get(buf2);
+ }
+ if (!desktop)
+ desktop = efreet_util_desktop_file_id_find(buf);
if (desktop) eo->desktops =
evas_list_append(eo->desktops, desktop);
}
}
}
fclose(f);
}
+ if (dir) free(dir);
}
static void
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
