From: Enlightenment C. <no...@cv...> - 2006-11-13 22:08:14
|
Enlightenment CVS committal Author : onefang Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_desktop Modified Files: ecore_desktop_menu.c Log Message: More documenting. =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- ecore_desktop_menu.c 13 Nov 2006 14:27:29 -0000 1.35 +++ ecore_desktop_menu.c 13 Nov 2006 22:08:10 -0000 1.36 @@ -1764,14 +1764,14 @@ *13100000 get the root <Menu> elements from that elements file/s. *13200000 remove the <Name> element from those root <Menu> elements. *13300000 replace that element with the child elements of those root <Menu> elements. -*13400000? expand the <DefaultMergeDirs> with the name/s of that elements file/s +*13400000? expand the <DefaultMergeDirs> to <MergeDir>'s $XDG_CONFIG_DIRS/menus/foo-merged/ for the menu file foo.menu +FIXME: The above should probably move to before 13000000 *14000000 loop until all <MergeFile> and <MergeDir> elements are done, *14000000 careful to avoid infinite loops in files that reference each other. *15000000 for each <Menu> recursively 15100000 consolidate duplicate child <Menu>s. *15200000 expand <DefaultAppDir>s and <DefaultDirectoryDir>s to <AppDir>s and <DirectoryDir>s. 15300000 consolidate duplicate child <AppDir>s, <DirectoryDir>s, and <Directory>s. - 15400000? resolve duplicate <Move>s. 16000000 for each <Menu> recursively (but from the deepest level out) 16100000 for each <Move> 16110000 do the move. @@ -1807,9 +1807,30 @@ *21321112 leave it as allocated. *30000000 generate unallocated menus -*31000000 Same as for menus, but only the <OnlyUnallocated> ones. +*31000000 Same as for generate menus, but only the <OnlyUnallocated> ones. *32000000 Only the unallocated .desktop entries can be used. 40000000 generate menu layout This part of the spec is a whole other rabbit hole, and optional. B-) +*/ + + +/* THINGS TAHT CAN BE DUPLICATED + +AppDir last dup is used +.desktop last dup is used +DirectoryDir last dup is used +.directory last dup is used +Directory last dup is used, unless it points to a non existant entry, then work your way backwards +LegacyDir last dup is used +MergeDir last dup is used +MergeFile last dup is used + +DefaultMergeDirs dirs that are earlier in the path go later in the menu, so they have priority +KDELegacyDirs dirs that are earlier in the path go later in the menu, so they have priority + +OnlyUnallocated & NotOnlyUnallocated last one wins, default is NotOnlyUnallocated +Deleted & NotDeleted last one wins + +Include & Exclude done in order */ |
From: Enlightenment C. <no...@cv...> - 2006-11-27 21:33:09
|
Enlightenment CVS committal Author : onefang Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore Modified Files: ecore_exe.c Log Message: A good catch by devilhorns. =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_exe.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -3 -r1.66 -r1.67 --- ecore_exe.c 5 Nov 2006 16:42:30 -0000 1.66 +++ ecore_exe.c 27 Nov 2006 21:33:01 -0000 1.67 @@ -848,9 +848,12 @@ ecore_timer_del(exe->doomsday_clock); exe->doomsday_clock = NULL; dead = exe->doomsday_clock_dead; - IF_FREE(dead->cmd); - free(dead); - exe->doomsday_clock_dead = NULL; + if (dead) + { + IF_FREE(dead->cmd); + free(dead); + exe->doomsday_clock_dead = NULL; + } } IF_FN_DEL(ecore_main_fd_handler_del, exe->write_fd_handler); IF_FN_DEL(ecore_main_fd_handler_del, exe->read_fd_handler); |
From: Enlightenment C. <no...@cv...> - 2007-02-20 04:12:48
|
Enlightenment CVS committal Author : onefang Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_desktop Modified Files: ecore_desktop.c Log Message: Patch by Thomas Stark to remove blank parameters from exe arguments. =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -3 -r1.71 -r1.72 --- ecore_desktop.c 21 Dec 2006 03:36:27 -0000 1.71 +++ ecore_desktop.c 20 Feb 2007 10:12:45 -0000 1.72 @@ -257,7 +257,10 @@ { *exe = '\0'; exe++; - result->exec_params = strdup(exe); + /* trim the parameter string */ + for(; isspace(*exe) && ((exe - result->exec) < PATH_MAX) && (*exe != '\0'); exe++); + if(*exe != '\0') + result->exec_params = strdup(exe); } } |