Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop_menu.c ecore_desktop_paths.c
Log Message:
The menu tuning continues. Should find many more apps now on some
systems. On the down side, some FDO menus are really badly built, and
will take way too long to parse. Some duplicates will be found too, but
it's likely that those that already suffered duplicates may not have
them any more. The path of the FDO menu is twisted, and many go mad
along the way.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ecore_desktop_menu.c 4 Sep 2006 10:57:42 -0000 1.13
+++ ecore_desktop_menu.c 5 Sep 2006 10:09:11 -0000 1.14
@@ -735,7 +735,8 @@
if (menu_path[i] == '/')
menu_count++;
}
- while (menu_count >= count)
+ /* FIXME: The (legacy_data->current) test is just to patch a seggie, find
out why. */
+ while ((menu_count >= count) && (legacy_data->current))
{
legacy_data->current = legacy_data->current->parent;
menu_count--;
@@ -962,6 +963,9 @@
sprintf(dir, "%s/%s", unxml_data->path, app_dir);
our_data.path = dir;
our_data.length = strlen(dir);
+#ifdef DEBUG
+ printf("EXPANDING -
_ecore_desktop_menu_expand_apps(unxml_data, %s) - %s\n", app_dir, dir);
+#endif
ecore_desktop_paths_recursive_search(dir, NULL, -1, NULL,
_ecore_desktop_menu_check_app,
&our_data);
@@ -1002,7 +1006,7 @@
#endif
}
- return 1;
+ return 0;
}
static int
@@ -1463,7 +1467,7 @@
key = (char *)node->key;
app = (char *)node->value;
#ifdef DEBUG
- printf("CHECKING %s - %s\n", key, app);
+ printf("CHECKING %s - %s\n", app, key);
#endif
if (!ecore_hash_get(pool, key))
ecore_hash_set(pool, strdup(key), strdup(app));
@@ -1499,7 +1503,7 @@
ecore_hash_set(generate_data->apps, key, strdup(app));
#ifdef DEBUG
printf("INCLUDING %s%s - %s\n",
- ((generate_data->unallocated) ? "UNALLOCATED " : ""),
key, app);
+ ((generate_data->unallocated) ? "UNALLOCATED " : ""),
app, key);
#endif
}
else
@@ -1507,7 +1511,7 @@
ecore_hash_remove(generate_data->apps, key);
#ifdef DEBUG
printf("EXCLUDING %s%s - %s\n",
- ((generate_data->unallocated) ? "UNALLOCATED " : ""),
key, app);
+ ((generate_data->unallocated) ? "UNALLOCATED " : ""),
app, key);
#endif
}
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ecore_desktop_paths.c 4 Sep 2006 10:57:42 -0000 1.18
+++ ecore_desktop_paths.c 5 Sep 2006 10:09:11 -0000 1.19
@@ -127,7 +127,7 @@
_ecore_desktop_paths_get(NULL, "XDG_DATA_HOME", "XDG_DATA_DIRS",
"~/.local/share:~/.kde/share",
"/usr/local/share:/usr/share",
- "applications:applnk",
+ "applications:applnk:applications/kde",
"dist/desktop-files:dist/short-menu:gnome/apps",
"xdgdata-apps:apps");
_ecore_desktop_paths_check_and_add(ecore_desktop_paths_desktops,
-------------------------------------------------------------------------
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
