Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin
Modified Files:
fdo_menus.c parse.c xmlame.c
Log Message:
Some preperation work for the merging stuff.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/fdo_menus.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- fdo_menus.c 19 Feb 2006 12:04:50 -0000 1.12
+++ fdo_menus.c 19 Feb 2006 13:16:46 -0000 1.13
@@ -35,6 +35,7 @@
char *base;
char *path;
Dumb_List *stack;
+ Dumb_List *merge_stack;
int unallocated;
};
@@ -192,6 +193,11 @@
result = 1;
}
}
+ else if (strcmp((char *)
list->elements[i].element, "<KDELegacyDirs/") == 0)
+ {
+ _fdo_menus_add_dirs(menu,
fdo_paths_kde_legacy, "<LegacyDir prefix=\"kde-\"", "</LegacyDir", NULL, i);
+ result = 1;
+ }
else if (strcmp((char *)
list->elements[i].element, "</Menu") == 0)
{
result = 1;
@@ -324,28 +330,29 @@
if (menu->elements[i].type ==
DUMB_LIST_ELEMENT_TYPE_STRING)
{
- if (strncmp((char *)
menu->elements[i].element, "<AppDir ", 8) == 0)
- {
- char *app_dir;
+ char *string;
- app_dir = (char *)
menu->elements[i].element;
- _fdo_menus_expand_apps(unxml_data,
&app_dir[8], pool);
+ string = (char *) menu->elements[i].element;
+ if (strncmp(string, "<AppDir ", 8) == 0)
+ {
+ _fdo_menus_expand_apps(unxml_data,
&string[8], pool);
result = 1;
}
- else if (strncmp((char *)
menu->elements[i].element, "<DirectoryDir ", 8) == 0)
+ else if (strncmp(string, "<DirectoryDir ", 8)
== 0)
+ {
+ }
+ else if (strncmp(string, "<LegacyDir ", 11)
== 0)
{
}
- else if (strncmp((char *)
menu->elements[i].element, "<MergeDir ", 8) == 0)
+ else if (strncmp(string, "<MergeDir ", 8) ==
0)
{
}
- else if (strncmp((char *)
menu->elements[i].element, "<MergeFile ", 8) == 0)
+ else if (strncmp(string, "<MergeFile ", 8) ==
0)
{
}
}
if (result)
{
- if (menu->elements[i].type ==
DUMB_LIST_ELEMENT_TYPE_LIST)
- dumb_list_del((Dumb_List *)
menu->elements[i].element);
menu->elements[i].type =
DUMB_LIST_ELEMENT_TYPE_NULL;
menu->elements[i].element = NULL;
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/parse.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- parse.c 19 Feb 2006 09:11:11 -0000 1.16
+++ parse.c 19 Feb 2006 13:16:46 -0000 1.17
@@ -545,6 +545,8 @@
if (result->data)
{
result->group = (Ecore_Hash *)
ecore_hash_get(result->data, "Desktop Entry");
+ if (!result->group)
+ result->group = (Ecore_Hash *)
ecore_hash_get(result->data, "KDE Desktop Entry");
if (result->group)
{
char *temp;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/xmlame.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- xmlame.c 8 Feb 2006 23:13:30 -0000 1.3
+++ xmlame.c 19 Feb 2006 13:16:46 -0000 1.4
@@ -61,7 +61,11 @@
}
list = xmlame_new(buffer);
if (list)
- _xmlame_parse(list, buffer);
+ {
+ /* Have thde file name as the first item on the list, for alter
reference. */
+ dumb_list_extend(list, file);
+ _xmlame_parse(list, buffer);
+ }
}
return list;
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
