Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c
Log Message:
No more duplicate icons in ibar.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_apps.c 22 Feb 2005 12:49:18 -0000 1.18
+++ e_apps.c 23 Feb 2005 11:29:41 -0000 1.19
@@ -94,8 +94,10 @@
char buf[PATH_MAX];
a = evas_hash_find(_e_apps, path);
- if ((a) && (!a->deleted))
+ if (a)
{
+ if (a->deleted)
+ return NULL;
e_object_ref(E_OBJECT(a));
return a;
}
@@ -669,7 +671,6 @@
if (!app->scanned)
return;
- printf("E_App: %d %d %s\n", type, event, path);
file = ecore_file_get_file((char *)path);
if (!strcmp(file, ".order"))
{
@@ -737,6 +738,7 @@
* to check which files are here. */
if ((type == ECORE_FILE_TYPE_DIRECTORY) && !strcmp(path,
app->path))
{
+#if 0
a2 = _e_app_subapp_path_find(app, path);
/* If this app is in a main repository, tell all referencing
@@ -752,9 +754,9 @@
_e_app_subdir_rescan(app);
}
}
+#endif
- /* We don't know why it's deleted, maybe it's move to 'all'?
- * Better rescan... */
+ /* We don't know why it's changed Better rescan... */
_e_app_subdir_rescan(app);
}
break;
@@ -781,6 +783,20 @@
a2 = _e_app_subapp_path_find(app, buf);
if (!a2)
{
+ /* Do we have a reference? */
+ Evas_List *pl;
+
+ pl = _e_apps_repositories;
+ while ((!a2) && (pl))
+ {
+ snprintf(buf, sizeof(buf), "%s/%s", (char *)pl->data, s);
+ a2 = _e_app_subapp_path_find(app, buf);
+ pl = pl->next;
+ }
+ }
+ if (!a2)
+ {
+ /* If we still haven't found it, it is new! */
a2 = e_app_new(buf, 1);
if (a2)
{
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
