From: Enlightenment C. <no...@cv...> - 2007-02-03 17:13:19
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin/data Modified Files: test.desktop Log Message: - update test.desktop file =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/data/test.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- test.desktop 3 Feb 2007 20:09:47 -0000 1.1 +++ test.desktop 3 Feb 2007 23:13:14 -0000 1.2 @@ -3,4 +3,6 @@ Name=Efreet Test Application GenericName=Test Application Exec=efreet_test %F %i -Categories=Test +Categories=Test;Enlightenment; +Icon=TestIcon +X-Test=Own key |
From: Enlightenment C. <no...@cv...> - 2007-02-04 19:39:52
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_desktop.c efreet_desktop.h Log Message: - unused =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- efreet_desktop.c 3 Feb 2007 13:05:30 -0000 1.1 +++ efreet_desktop.c 5 Feb 2007 01:39:46 -0000 1.2 @@ -409,18 +409,6 @@ } /** - * @param desktop: The desktop to work with - * @return Returns 1 if the desktop is set to NoDisplay, 0 otherwise - * @brief Retrives the NoDisplay parameter from the desktop file - */ -int -efreet_desktop_no_display_get(Efreet_Desktop *desktop) -{ - if (!desktop) return 0; - return desktop->no_display; -} - -/** * @internal * @param environment: the environment name * @brief sets the global desktop environment name =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- efreet_desktop.h 3 Feb 2007 13:05:30 -0000 1.1 +++ efreet_desktop.h 5 Feb 2007 01:39:46 -0000 1.2 @@ -93,8 +93,6 @@ void efreet_desktop_exec(Efreet_Desktop *desktop, Ecore_List *files, void *data); -int efreet_desktop_no_display_get(Efreet_Desktop *desktop); - void efreet_desktop_environment_set(const char *environment); int efreet_desktop_command_progress_get(Efreet_Desktop *desktop, Ecore_List *files, |
From: Enlightenment C. <no...@cv...> - 2007-02-04 20:06:07
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_desktop.c efreet_desktop.h Log Message: - allow the app to add custom Types to be matched in the .desktop file. (e17 uses this for Mount and a few other types) =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- efreet_desktop.c 5 Feb 2007 01:39:46 -0000 1.2 +++ efreet_desktop.c 5 Feb 2007 02:06:05 -0000 1.3 @@ -19,6 +19,11 @@ static Ecore_Hash *efreet_desktop_cache = NULL; /** + * A list of the desktop types available + */ +static Ecore_List *efreet_desktop_types = NULL; + +/** * A unique id for each tmp file created while building a command */ static int efreet_desktop_command_file_id = 0; @@ -95,6 +100,9 @@ ecore_hash_set_free_value(efreet_desktop_cache, ECORE_FREE_CB(efreet_desktop_free)); + efreet_desktop_types = ecore_list_new(); + ecore_list_set_free_cb(efreet_desktop_types, ECORE_FREE_CB(free)); + return init; } @@ -109,10 +117,11 @@ if (--init) return init; ecore_file_shutdown(); ecore_string_shutdown(); - if (desktop_environment) ecore_string_release(desktop_environment); - desktop_environment = NULL; + IF_RELEASE(desktop_environment); IF_FREE_HASH(efreet_desktop_cache); + IF_FREE_LIST(efreet_desktop_types); + return init; } @@ -234,24 +243,26 @@ efreet_ini_string_get(ini, "Type")); desktop->version = efreet_ini_double_get(ini, "Version"); - switch (desktop->type) + if (desktop->type == EFREET_DESKTOP_TYPE_APPLICATION) + { + if (!efreet_desktop_application_fields_parse(desktop, ini)) + error = 1; + } + else if (desktop->type == EFREET_DESKTOP_TYPE_LINK) { - case EFREET_DESKTOP_TYPE_APPLICATION: - if (!efreet_desktop_application_fields_parse(desktop, ini)) - error = 1; - break; - case EFREET_DESKTOP_TYPE_LINK: - if (!efreet_desktop_link_fields_parse(desktop, ini)) - error = 1; - break; - case EFREET_DESKTOP_TYPE_DIRECTORY: - /* there are no directory specific fields */ - break; - case EFREET_DESKTOP_TYPE_UNKNOWN: - default: + if (!efreet_desktop_link_fields_parse(desktop, ini)) error = 1; - break; } + else if (desktop->type == EFREET_DESKTOP_TYPE_DIRECTORY) + { + /* there are no directory specific fields */ + } + else if (desktop->type >= (EFREET_DESKTOP_TYPE_MAX + 1)) + { + /* XXX which user fields should we be parsing? */ + } + else + error = 1; } if (!error && !efreet_desktop_environment_check(ini)) error = 1; @@ -285,24 +296,29 @@ efreet_ini_section_add(ini, "Desktop Entry"); efreet_ini_section_set(ini, "Desktop Entry"); - switch (desktop->type) + if (desktop->type == EFREET_DESKTOP_TYPE_APPLICATION) + { + efreet_ini_string_set(ini, "Type", "Application"); + efreet_desktop_application_fields_save(desktop, ini); + } + else if (desktop->type == EFREET_DESKTOP_TYPE_LINK) + { + efreet_ini_string_set(ini, "Type", "Link"); + efreet_desktop_link_fields_save(desktop, ini); + } + else if (desktop->type == EFREET_DESKTOP_TYPE_DIRECTORY) + { + efreet_ini_string_set(ini, "Type", "Directory"); + } + else if (desktop->type > EFREET_DESKTOP_TYPE_MAX + 1) { - case EFREET_DESKTOP_TYPE_APPLICATION: - efreet_ini_string_set(ini, "Type", "Application"); - efreet_desktop_application_fields_save(desktop, ini); - break; - case EFREET_DESKTOP_TYPE_LINK: - efreet_ini_string_set(ini, "Type", "Link"); - efreet_desktop_link_fields_save(desktop, ini); - break; - case EFREET_DESKTOP_TYPE_DIRECTORY: - efreet_ini_string_set(ini, "Type", "Directory"); - break; - case EFREET_DESKTOP_TYPE_UNKNOWN: - default: - ok = 0; - break; + ecore_list_goto_index(efreet_desktop_types, + (desktop->type - (EFREET_DESKTOP_TYPE_MAX + 1))); + efreet_ini_string_set(ini, "Type", + (char *)ecore_list_current(efreet_desktop_types)); } + else + ok = 0; if (ok) { @@ -479,6 +495,23 @@ return found; } + +/** + * @param type: The type to add to the list of matching types + * @return Returns no value + * @brief Adds the given type to the list of types in the system + */ +int +efreet_desktop_type_add(const char *type) +{ + int id; + + id = ecore_list_nodes(efreet_desktop_types); + ecore_list_append(efreet_desktop_types, strdup(type)); + + return (id + EFREET_DESKTOP_TYPE_MAX + 1); +} + /** * @internal * @param type_str: the type as a string @@ -488,6 +521,9 @@ static Efreet_Desktop_Type efreet_desktop_type_parse(const char *type_str) { + char *str; + int count = 0; + if (!type_str) return EFREET_DESKTOP_TYPE_UNKNOWN; if (!strcmp("Application", type_str)) @@ -496,6 +532,15 @@ return EFREET_DESKTOP_TYPE_LINK; if (!strcmp("Directory", type_str)) return EFREET_DESKTOP_TYPE_DIRECTORY; + + /* check the user added types */ + ecore_list_goto_first(efreet_desktop_types); + while ((str = ecore_list_next(efreet_desktop_types))) + { + if (!strcmp(str, type_str)) + return (count + EFREET_DESKTOP_TYPE_MAX + 1); + count ++; + } return EFREET_DESKTOP_TYPE_UNKNOWN; } =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- efreet_desktop.h 5 Feb 2007 01:39:46 -0000 1.2 +++ efreet_desktop.h 5 Feb 2007 02:06:05 -0000 1.3 @@ -20,7 +20,8 @@ EFREET_DESKTOP_TYPE_UNKNOWN, EFREET_DESKTOP_TYPE_APPLICATION, EFREET_DESKTOP_TYPE_LINK, - EFREET_DESKTOP_TYPE_DIRECTORY + EFREET_DESKTOP_TYPE_DIRECTORY, + EFREET_DESKTOP_TYPE_MAX }; /** @@ -109,6 +110,8 @@ const char *category); int efreet_desktop_category_del(Efreet_Desktop *desktop, const char *category); + +int efreet_desktop_type_add(const char *type); /** * @} |
From: Enlightenment C. <no...@cv...> - 2007-02-04 20:06:37
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin/data Modified Files: Makefile.am Added Files: test_type.desktop Log Message: - allow the app to add custom Types to be matched in the .desktop file. (e17 uses this for Mount and a few other types) =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/data/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 3 Feb 2007 13:08:15 -0000 1.1 +++ Makefile.am 5 Feb 2007 02:06:05 -0000 1.2 @@ -6,6 +6,7 @@ test.ini \ long.ini \ test.desktop \ +test_type.desktop \ test.menu \ preferences.menu |
From: Enlightenment C. <no...@cv...> - 2007-02-04 20:06:39
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin Modified Files: ef_desktop.c main.c Log Message: - allow the app to add custom Types to be matched in the .desktop file. (e17 uses this for Mount and a few other types) =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_desktop.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ef_desktop.c 3 Feb 2007 13:05:30 -0000 1.1 +++ ef_desktop.c 5 Feb 2007 02:06:05 -0000 1.2 @@ -17,7 +17,6 @@ int ret = 1; desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop"); - if (!desktop) { printf("No desktop found.\n"); @@ -344,3 +343,36 @@ free(exec); } + +int +ef_cb_desktop_type_parse(void) +{ + Efreet_Desktop *desktop; + int ret = 1, my_type; + + /* add my custom desktop type to efreet */ + my_type = efreet_desktop_type_add("My_Type"); + if (my_type <= EFREET_DESKTOP_TYPE_MAX) + { + printf("Error adding desktop type."); + return 0; + } + + desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test_type.desktop"); + if (!desktop) + { + printf("No desktop found.\n"); + return 0; + } + + if (desktop->type != my_type) + { + printf("Invalid type returned in desktop"); + return 0; + } + + return 1; +} + + + =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- main.c 3 Feb 2007 13:05:30 -0000 1.1 +++ main.c 5 Feb 2007 02:06:05 -0000 1.2 @@ -15,13 +15,14 @@ int ef_cb_ini_parse(void); int ef_cb_locale(void); int ef_cb_desktop_parse(void); +int ef_cb_desktop_save(void); +int ef_cb_desktop_command_get(void); +int ef_cb_desktop_type_parse(void); #if 0 int ef_cb_desktop_file_id(void); #endif int ef_cb_menu_get(void); int ef_cb_ini_long_line(void); -int ef_cb_desktop_save(void); -int ef_cb_desktop_command_get(void); typedef struct Efreet_Test Efreet_Test; struct Efreet_Test @@ -43,12 +44,13 @@ {"INI Long Line Parsing", ef_cb_ini_long_line}, {"Locale Parsing", ef_cb_locale}, {"Desktop Parsing", ef_cb_desktop_parse}, + {"Desktop Type Parsing", ef_cb_desktop_type_parse}, + {"Desktop Save", ef_cb_desktop_save}, + {"Desktop Command", ef_cb_desktop_command_get}, #if 0 {"Desktop File ID", ef_cb_desktop_file_id}, #endif {"Menu Parsing", ef_cb_menu_get}, - {"Desktop Save", ef_cb_desktop_save}, - {"Desktop Command", ef_cb_desktop_command_get}, {NULL, NULL} }; |
From: Enlightenment C. <no...@cv...> - 2007-02-05 15:17:02
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin Modified Files: ef_desktop.c Log Message: - setup the internal types (APPLICATION, DIRECTORY and LINK) to use the type registration system =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_desktop.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ef_desktop.c 5 Feb 2007 20:23:31 -0000 1.3 +++ ef_desktop.c 5 Feb 2007 21:16:55 -0000 1.4 @@ -125,6 +125,12 @@ printf("\n"); desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop"); + if (!desktop) + { + printf("Failed to get Desktop file\n"); + return 0; + } + printf("save data: %d\n", efreet_desktop_save(desktop)); desktop = efreet_desktop_empty_new("/tmp/test.desktop"); @@ -361,12 +367,8 @@ char *val; /* add my custom desktop type to efreet */ - my_type = efreet_desktop_type_add("My_Type", cb_type_parse, (Efreet_Desktop_Type_Free_Cb)free); - if (my_type <= EFREET_DESKTOP_TYPE_MAX) - { - printf("Error adding desktop type."); - return 0; - } + my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL, + (Efreet_Desktop_Type_Free_Cb)free); desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test_type.desktop"); if (!desktop) |
From: Enlightenment C. <no...@cv...> - 2007-02-05 15:17:05
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_desktop.c efreet_desktop.h Log Message: - setup the internal types (APPLICATION, DIRECTORY and LINK) to use the type registration system =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- efreet_desktop.c 5 Feb 2007 20:23:31 -0000 1.4 +++ efreet_desktop.c 5 Feb 2007 21:16:55 -0000 1.5 @@ -30,6 +30,10 @@ static int init = 0; +int EFREET_DESKTOP_TYPE_APPLICATION = 0; +int EFREET_DESKTOP_TYPE_LINK = 0; +int EFREET_DESKTOP_TYPE_DIRECTORY = 0; + /** * @internal * Information about custom types @@ -37,20 +41,22 @@ typedef struct Efreet_Desktop_Type_Info Efreet_Desktop_Type_Info; struct Efreet_Desktop_Type_Info { + int id; char *type; Efreet_Desktop_Type_Parse_Cb parse_func; + Efreet_Desktop_Type_Save_Cb save_func; Efreet_Desktop_Type_Free_Cb free_func; }; static Efreet_Desktop *efreet_desktop_new(const char *file); -static Efreet_Desktop_Type efreet_desktop_type_parse(const char *type_str); +static Efreet_Desktop_Type_Info *efreet_desktop_type_parse(const char *type_str); static Ecore_List *efreet_desktop_string_list_parse(const char *string); static char *efreet_desktop_string_list_join(Ecore_List *list); -static int efreet_desktop_application_fields_parse(Efreet_Desktop *desktop, +static void *efreet_desktop_application_fields_parse(Efreet_Desktop *desktop, Efreet_Ini *ini); static void efreet_desktop_application_fields_save(Efreet_Desktop *desktop, Efreet_Ini *ini); -static int efreet_desktop_link_fields_parse(Efreet_Desktop *desktop, +static void *efreet_desktop_link_fields_parse(Efreet_Desktop *desktop, Efreet_Ini *ini); static void efreet_desktop_link_fields_save(Efreet_Desktop *desktop, Efreet_Ini *ini); @@ -115,7 +121,18 @@ ECORE_FREE_CB(efreet_desktop_free)); efreet_desktop_types = ecore_list_new(); - ecore_list_set_free_cb(efreet_desktop_types, ECORE_FREE_CB(efreet_desktop_type_info_free)); + ecore_list_set_free_cb(efreet_desktop_types, + ECORE_FREE_CB(efreet_desktop_type_info_free)); + + EFREET_DESKTOP_TYPE_APPLICATION = efreet_desktop_type_add("Application", + efreet_desktop_application_fields_parse, + efreet_desktop_application_fields_save, + NULL); + EFREET_DESKTOP_TYPE_LINK = efreet_desktop_type_add("Link", + efreet_desktop_link_fields_parse, + efreet_desktop_link_fields_save, NULL); + EFREET_DESKTOP_TYPE_DIRECTORY = efreet_desktop_type_add("Directory", NULL, + NULL, NULL); return init; } @@ -186,11 +203,6 @@ desktop = efreet_desktop_new(file); if (!desktop) return NULL; - if (!desktop->type) - { - efreet_desktop_free(desktop); - return NULL; - } ecore_hash_set(efreet_desktop_cache, strdup(file), desktop); return desktop; @@ -253,29 +265,14 @@ if (!error) { - desktop->type = efreet_desktop_type_parse( - efreet_ini_string_get(ini, "Type")); - desktop->version = efreet_ini_double_get(ini, "Version"); + Efreet_Desktop_Type_Info *info; - if (desktop->type == EFREET_DESKTOP_TYPE_APPLICATION) - { - if (!efreet_desktop_application_fields_parse(desktop, ini)) - error = 1; - } - else if (desktop->type == EFREET_DESKTOP_TYPE_LINK) + info = efreet_desktop_type_parse(efreet_ini_string_get(ini, "Type")); + if (info) { - if (!efreet_desktop_link_fields_parse(desktop, ini)) - error = 1; - } - else if (desktop->type == EFREET_DESKTOP_TYPE_DIRECTORY) - { - /* there are no directory specific fields */ - } - else if (desktop->type >= (EFREET_DESKTOP_TYPE_MAX + 1)) - { - Efreet_Desktop_Type_Info *info; - info = ecore_list_goto_index(efreet_desktop_types, - (desktop->type - (EFREET_DESKTOP_TYPE_MAX + 1))); + desktop->type = info->id; + desktop->version = efreet_ini_double_get(ini, "Version"); + if (info->parse_func) desktop->type_data = info->parse_func(desktop, ini); } @@ -307,6 +304,7 @@ int efreet_desktop_save(Efreet_Desktop *desktop) { + Efreet_Desktop_Type_Info *info; Efreet_Ini *ini; int ok = 1; @@ -314,27 +312,11 @@ efreet_ini_section_add(ini, "Desktop Entry"); efreet_ini_section_set(ini, "Desktop Entry"); - if (desktop->type == EFREET_DESKTOP_TYPE_APPLICATION) - { - efreet_ini_string_set(ini, "Type", "Application"); - efreet_desktop_application_fields_save(desktop, ini); - } - else if (desktop->type == EFREET_DESKTOP_TYPE_LINK) + info = ecore_list_goto_index(efreet_desktop_types, desktop->type); + if (info) { - efreet_ini_string_set(ini, "Type", "Link"); - efreet_desktop_link_fields_save(desktop, ini); - } - else if (desktop->type == EFREET_DESKTOP_TYPE_DIRECTORY) - { - efreet_ini_string_set(ini, "Type", "Directory"); - } - else if (desktop->type > EFREET_DESKTOP_TYPE_MAX + 1) - { - Efreet_Desktop_Type_Info *info; - info = ecore_list_goto_index(efreet_desktop_types, - (desktop->type - (EFREET_DESKTOP_TYPE_MAX + 1))); - if (info) - efreet_ini_string_set(ini, "Type", info->type); + efreet_ini_string_set(ini, "Type", info->type); + if (info->save_func) info->save_func(desktop, ini); } else ok = 0; @@ -419,11 +401,10 @@ IF_FREE_HASH(desktop->x); - if (desktop->type >= EFREET_DESKTOP_TYPE_MAX + 1 && desktop->type_data) + if (desktop->type_data) { Efreet_Desktop_Type_Info *info; - info = ecore_list_goto_index(efreet_desktop_types, - (desktop->type - (EFREET_DESKTOP_TYPE_MAX + 1))); + info = ecore_list_goto_index(efreet_desktop_types, desktop->type); if (info->free_func) info->free_func(desktop->type_data); } @@ -527,12 +508,14 @@ /** * @param type: The type to add to the list of matching types * @param parse_func: a function to parse out custom fields + * @param save_func: a function to save data returned from @a parse_func * @param free_func: a function to free data returned from @a parse_func * @return Returns the id of the new type * @brief Adds the given type to the list of types in the system */ int efreet_desktop_type_add(const char *type, Efreet_Desktop_Type_Parse_Cb parse_func, + Efreet_Desktop_Type_Save_Cb save_func, Efreet_Desktop_Type_Free_Cb free_func) { int id; @@ -541,14 +524,17 @@ info = NEW(Efreet_Desktop_Type_Info, 1); if (!info) return 0; + id = ecore_list_nodes(efreet_desktop_types); + + info->id = id; info->type = strdup(type); info->parse_func = parse_func; + info->save_func = save_func; info->free_func = free_func; - id = ecore_list_nodes(efreet_desktop_types); ecore_list_append(efreet_desktop_types, info); - return (id + EFREET_DESKTOP_TYPE_MAX + 1); + return id; } /** @@ -580,31 +566,21 @@ * @return the parsed type * @brief parse the type string into an Efreet_Desktop_Type */ -static Efreet_Desktop_Type +static Efreet_Desktop_Type_Info * efreet_desktop_type_parse(const char *type_str) { Efreet_Desktop_Type_Info *info; - int count = 0; - if (!type_str) return EFREET_DESKTOP_TYPE_UNKNOWN; + if (!type_str) return NULL; - if (!strcmp("Application", type_str)) - return EFREET_DESKTOP_TYPE_APPLICATION; - if (!strcmp("Link", type_str)) - return EFREET_DESKTOP_TYPE_LINK; - if (!strcmp("Directory", type_str)) - return EFREET_DESKTOP_TYPE_DIRECTORY; - - /* check the user added types */ ecore_list_goto_first(efreet_desktop_types); while ((info = ecore_list_next(efreet_desktop_types))) { if (!strcmp(info->type, type_str)) - return (count + EFREET_DESKTOP_TYPE_MAX + 1); - count ++; + return info; } - return EFREET_DESKTOP_TYPE_UNKNOWN; + return NULL; } /** @@ -693,10 +669,10 @@ * @internal * @param desktop: the Efreet_Desktop to store parsed fields in * @param ini: the Efreet_Ini to parse fields from - * @return 1 if parsed succesfully, 0 otherwise + * @return No value * @brief Parse application specific desktop fields */ -static int +static void * efreet_desktop_application_fields_parse(Efreet_Desktop *desktop, Efreet_Ini *ini) { const char *val; @@ -721,7 +697,7 @@ desktop->terminal = efreet_ini_boolean_get(ini, "Terminal"); desktop->startup_notify = efreet_ini_boolean_get(ini, "StartupNotify"); - return 1; + return NULL; } /** @@ -770,17 +746,17 @@ * @internal * @param desktop: the Efreet_Desktop to store parsed fields in * @param ini: the Efreet_Ini to parse fields from - * @return 1 if parsed succesfully, 0 otherwise + * @return Returns no value * @brief Parse link specific desktop fields */ -static int +static void * efreet_desktop_link_fields_parse(Efreet_Desktop *desktop, Efreet_Ini *ini) { const char *val; val = efreet_ini_string_get(ini, "URL"); if (val) desktop->url = strdup(val); - return 1; + return NULL; } /** =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- efreet_desktop.h 5 Feb 2007 20:23:31 -0000 1.4 +++ efreet_desktop.h 5 Feb 2007 21:16:55 -0000 1.5 @@ -14,17 +14,9 @@ * @{ */ -/** - * Possible types of .desktop files. Unknown files are ignored. - */ -enum Efreet_Desktop_Type -{ - EFREET_DESKTOP_TYPE_UNKNOWN, - EFREET_DESKTOP_TYPE_APPLICATION, - EFREET_DESKTOP_TYPE_LINK, - EFREET_DESKTOP_TYPE_DIRECTORY, - EFREET_DESKTOP_TYPE_MAX -}; +extern int EFREET_DESKTOP_TYPE_APPLICATION; +extern int EFREET_DESKTOP_TYPE_LINK; +extern int EFREET_DESKTOP_TYPE_DIRECTORY; /** * Efreet_Desktop_Type @@ -39,12 +31,14 @@ /** * A callback used with efreet_desktop_command_get() */ -typedef void (*Efreet_Desktop_Command_Cb) (void *data, Efreet_Desktop *desktop, char *command, int remaining); +typedef void (*Efreet_Desktop_Command_Cb) (void *data, Efreet_Desktop *desktop, + char *command, int remaining); /** * A callback used to get download progress of remote uris */ -typedef int (*Efreet_Desktop_Progress_Cb) (void *data, Efreet_Desktop *desktop, char *uri, long int total, long int current); +typedef int (*Efreet_Desktop_Progress_Cb) (void *data, Efreet_Desktop *desktop, + char *uri, long int total, long int current); /** * A callback used to parse data for custom types @@ -52,6 +46,11 @@ typedef void *(*Efreet_Desktop_Type_Parse_Cb) (Efreet_Desktop *desktop, Efreet_Ini *ini); /** + * A callback used to save data for custom types + */ +typedef void (*Efreet_Desktop_Type_Save_Cb) (Efreet_Desktop *desktop, Efreet_Ini *ini); + +/** * A callback used to free data for custom types */ typedef void *(*Efreet_Desktop_Type_Free_Cb) (void *data); @@ -62,7 +61,7 @@ */ struct Efreet_Desktop { - Efreet_Desktop_Type type; /**< type of desktop file */ + int type; /**< type of desktop file */ double version; /**< version of spec file conforms to */ @@ -124,7 +123,10 @@ int efreet_desktop_category_del(Efreet_Desktop *desktop, const char *category); -int efreet_desktop_type_add(const char *type, Efreet_Desktop_Type_Parse_Cb parse_func, Efreet_Desktop_Type_Free_Cb free_func); +int efreet_desktop_type_add(const char *type, + Efreet_Desktop_Type_Parse_Cb parse_func, + Efreet_Desktop_Type_Save_Cb save_func, + Efreet_Desktop_Type_Free_Cb free_func); /** * @} |
From: Enlightenment C. <no...@cv...> - 2007-02-05 20:05:01
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_menu.c Log Message: - formatting =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_menu.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- efreet_menu.c 3 Feb 2007 13:05:30 -0000 1.1 +++ efreet_menu.c 6 Feb 2007 02:04:50 -0000 1.2 @@ -38,14 +38,14 @@ { const char *internal; /**< The menu name */ const char *name; /**< Name to use in the menus */ - } name; /**< The names for this menu */ + } name; /**< The names for this menu */ Efreet_Desktop *directory; /**< The directory */ Ecore_DList *directories; /**< All the directories set in the menu file */ Efreet_Menu_Move *current_move; /**< The current move */ - Ecore_List *app_dirs; /**< .desktop application directories */ + Ecore_List *app_dirs; /**< .desktop application directories */ Ecore_List *app_pool; /**< application pool */ Ecore_List *applications; /**< applications in this menu */ @@ -53,14 +53,14 @@ Ecore_DList *directory_dirs; /**< .directory file directories */ Ecore_Hash *directory_cache; /**< .directory dirs */ - Ecore_List *moves; /**< List of moves to be handled by the menu */ - Ecore_List *filters; /**< Include and Exclude filters */ + Ecore_List *moves; /**< List of moves to be handled by the menu */ + Ecore_List *filters; /**< Include and Exclude filters */ - Efreet_Menu_Internal *parent; /**< Our parent menu */ - Ecore_List *sub_menus; /**< Our sub menus */ + Efreet_Menu_Internal *parent; /**< Our parent menu */ + Ecore_List *sub_menus; /**< Our sub menus */ - Ecore_List *layout; /**< This menus layout */ - Ecore_List *default_layout; /**< Default layout */ + Ecore_List *layout; /**< This menus layout */ + Ecore_List *default_layout; /**< Default layout */ char show_empty; /**< Whether to show empty menus */ char in_line; /**< Whether this meny can be inlined */ char inline_limit; /**< Number of elements which triggers inline */ |
From: Enlightenment C. <no...@cv...> - 2007-03-24 19:46:47
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet Modified Files: Doxyfile Log Message: - don't use PDFLATEX =================================================================== RCS file: /cvs/e/e17/libs/efreet/Doxyfile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Doxyfile 3 Feb 2007 13:05:29 -0000 1.1 +++ Doxyfile 24 Mar 2007 19:44:33 -0000 1.2 @@ -798,7 +798,7 @@ # plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. -USE_PDFLATEX = YES +USE_PDFLATEX = NO # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. # command to the generated LaTeX files. This will instruct LaTeX to keep |
From: Enlightenment C. <no...@cv...> - 2007-03-24 19:49:30
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet Modified Files: Doxyfile Log Message: - make this consistent with the rest of the efl =================================================================== RCS file: /cvs/e/e17/libs/efreet/Doxyfile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Doxyfile 24 Mar 2007 19:44:33 -0000 1.2 +++ Doxyfile 24 Mar 2007 19:49:28 -0000 1.3 @@ -30,7 +30,7 @@ # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = docs +OUTPUT_DIRECTORY = doc # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output |
From: Enlightenment C. <no...@cv...> - 2007-03-26 16:31:16
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin Modified Files: ef_data_dirs.c Log Message: - better error output =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_data_dirs.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ef_data_dirs.c 3 Feb 2007 13:05:30 -0000 1.1 +++ ef_data_dirs.c 26 Mar 2007 16:31:10 -0000 1.2 @@ -11,11 +11,14 @@ putenv("XDG_DATA_HOME=/var/tmp"); + efreet_shutdown(); + efreet_init(); + tmp = efreet_data_home_get(); if (strcmp(tmp, "/var/tmp")) { printf("efreet_data_home_get() returned incorrect " - "value on XDG_DATA_HOME=/var/tmp\n"); + "value (%s) on XDG_DATA_HOME=/var/tmp\n", tmp); ret = 0; } @@ -30,7 +33,7 @@ if (strcmp(tmp, "/home/tmp/.local/share")) { printf("efreet_data_home_get() returned incorrect " - "value on blank XDG_DATA_HOME\n"); + "value (%s) on blank XDG_DATA_HOME\n", tmp); ret = 0; } @@ -60,11 +63,14 @@ putenv("XDG_CONFIG_HOME=/var/tmp"); + efreet_shutdown(); + efreet_init(); + tmp = efreet_config_home_get(); if (strcmp(tmp, "/var/tmp")) { printf("efreet_config_home_get() returned incorrect " - "value on XDG_CONFIG_HOME=/var/tmp\n"); + "value (%s) on XDG_CONFIG_HOME=/var/tmp\n", tmp); ret = 0; } @@ -79,7 +85,7 @@ if (strcmp(tmp, "/home/tmp/.config")) { printf("efreet_config_home_get() returned incorrect " - "value on blank XDG_CONFIG_HOME\n"); + "value (%s) on blank XDG_CONFIG_HOME\n", tmp); ret = 0; } @@ -109,11 +115,14 @@ putenv("XDG_CACHE_HOME=/var/tmp"); + efreet_shutdown(); + efreet_init(); + tmp = efreet_cache_home_get(); if (strcmp(tmp, "/var/tmp")) { printf("efreet_cache_home_get() returned incorrect " - "value on XDG_CACHE_HOME=/var/tmp\n"); + "value (%s) on XDG_CACHE_HOME=/var/tmp\n", tmp); ret = 0; } @@ -128,7 +137,7 @@ if (strcmp(tmp, "/home/tmp/.cache")) { printf("efreet_cache_home_get() returned incorrect " - "value on blank XDG_CACHE_HOME\n"); + "value (%s) on blank XDG_CACHE_HOME\n", tmp); ret = 0; } @@ -169,6 +178,9 @@ putenv(dirs); + efreet_shutdown(); + efreet_init(); + i = 0; tmp = efreet_data_dirs_get(); ecore_list_goto_first(tmp); @@ -241,6 +253,9 @@ } putenv(dirs); + + efreet_shutdown(); + efreet_init(); i = 0; tmp = efreet_config_dirs_get(); |
From: Enlightenment C. <no...@cv...> - 2007-03-26 16:53:58
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin Modified Files: ef_data_dirs.c Log Message: - setup the environment between shutdown() and init() in case the init() stuff access the env. =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_data_dirs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ef_data_dirs.c 26 Mar 2007 16:31:10 -0000 1.2 +++ ef_data_dirs.c 26 Mar 2007 16:53:56 -0000 1.3 @@ -9,9 +9,8 @@ const char *tmp; int ret = 1; - putenv("XDG_DATA_HOME=/var/tmp"); - efreet_shutdown(); + setenv("XDG_DATA_HOME", "/var/tmp", 1); efreet_init(); tmp = efreet_data_home_get(); @@ -24,11 +23,10 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); + setenv("XDG_DATA_HOME", "", 1); + setenv("HOME", "/home/tmp", 1); efreet_init(); - putenv("XDG_DATA_HOME="); - putenv("HOME=/home/tmp"); - tmp = efreet_data_home_get(); if (strcmp(tmp, "/home/tmp/.local/share")) { @@ -39,11 +37,10 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); + setenv("XDG_DATA_HOME", "", 1); + setenv("HOME", "", 1); efreet_init(); - putenv("XDG_DATA_HOME="); - putenv("HOME="); - tmp = efreet_data_home_get(); if (strcmp(tmp, "/tmp/.local/share")) { @@ -61,9 +58,8 @@ const char *tmp; int ret = 1; - putenv("XDG_CONFIG_HOME=/var/tmp"); - efreet_shutdown(); + setenv("XDG_CONFIG_HOME", "/var/tmp", 1); efreet_init(); tmp = efreet_config_home_get(); @@ -76,11 +72,10 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); + setenv("XDG_CONFIG_HOME", "", 1); + setenv("HOME", "/home/tmp", 1); efreet_init(); - putenv("XDG_CONFIG_HOME="); - putenv("HOME=/home/tmp"); - tmp = efreet_config_home_get(); if (strcmp(tmp, "/home/tmp/.config")) { @@ -91,11 +86,10 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); + setenv("XDG_CONFIG_HOME", "", 1); + setenv("HOME", "", 1); efreet_init(); - putenv("XDG_CONFIG_HOME="); - putenv("HOME="); - tmp = efreet_config_home_get(); if (strcmp(tmp, "/tmp/.config")) { @@ -113,9 +107,8 @@ const char *tmp; int ret = 1; - putenv("XDG_CACHE_HOME=/var/tmp"); - efreet_shutdown(); + setenv("XDG_CACHE_HOME", "/var/tmp", 1); efreet_init(); tmp = efreet_cache_home_get(); @@ -128,11 +121,10 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); + setenv("XDG_CACHE_HOME", "", 1); + setenv("HOME", "/home/tmp", 1); efreet_init(); - putenv("XDG_CACHE_HOME="); - putenv("HOME=/home/tmp"); - tmp = efreet_cache_home_get(); if (strcmp(tmp, "/home/tmp/.cache")) { @@ -143,11 +135,10 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); + setenv("XDG_CACHE_HOME", "", 1); + setenv("HOME", "", 1); efreet_init(); - putenv("XDG_CACHE_HOME="); - putenv("HOME="); - tmp = efreet_cache_home_get(); if (strcmp(tmp, "/tmp/.cache")) { @@ -169,16 +160,14 @@ char *def_vals[] = {"/usr/local/share", "/usr/share", NULL}; dirs[0] = '\0'; - strcat(dirs, "XDG_DATA_DIRS="); for (i = 0; vals[i] != NULL; i++) { if (i > 0) strcat(dirs, ":"); strcat(dirs, vals[i]); } - putenv(dirs); - efreet_shutdown(); + setenv("XDG_DATA_DIRS", dirs, 1); efreet_init(); i = 0; @@ -205,10 +194,9 @@ } efreet_shutdown(); + setenv("XDG_DATA_DIRS", "", 1); efreet_init(); - putenv("XDG_DATA_DIRS="); - i = 0; tmp = efreet_data_dirs_get(); ecore_list_goto_first(tmp); @@ -245,16 +233,14 @@ dirs[0] = '\0'; - strcat(dirs, "XDG_CONFIG_DIRS="); for (i = 0; vals[i] != NULL; i++) { if (i > 0) strcat(dirs, ":"); strcat(dirs, vals[i]); } - putenv(dirs); - efreet_shutdown(); + setenv("XDG_CONFIG_DIRS", dirs, 1); efreet_init(); i = 0; @@ -281,9 +267,8 @@ } efreet_shutdown(); + setenv("XDG_CONFIG_DIRS", "", 1); efreet_init(); - - putenv("XDG_CONFIG_DIRS="); i = 0; tmp = efreet_config_dirs_get(); |
From: Enlightenment C. <no...@cv...> - 2007-03-26 16:58:29
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin Modified Files: ef_icon_theme.c Log Message: - fixup icon theme test =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_icon_theme.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ef_icon_theme.c 3 Feb 2007 13:05:30 -0000 1.1 +++ ef_icon_theme.c 26 Mar 2007 16:58:27 -0000 1.2 @@ -24,7 +24,9 @@ int ret = 1; const char *tmp; + efreet_shutdown(); putenv("HOME=/var/tmp"); + efreet_init(); tmp = efreet_icon_dir_get(); if (strcmp(tmp, "/var/tmp/.icons")) @@ -35,15 +37,14 @@ } efreet_shutdown(); + unsetenv("HOME"); efreet_init(); - putenv("HOME="); - tmp = efreet_icon_dir_get(); if (strcmp(tmp, "/tmp/.icons")) { printf("efreet_icon_dir_get() returned incorrect " - "value on HOME=\n"); + "value (%s) on HOME=\n", tmp); ret = 0; } |
From: Enlightenment C. <no...@cv...> - 2007-03-26 17:00:19
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin Modified Files: ef_data_dirs.c Log Message: - use unsetenv() =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_data_dirs.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ef_data_dirs.c 26 Mar 2007 16:53:56 -0000 1.3 +++ ef_data_dirs.c 26 Mar 2007 17:00:17 -0000 1.4 @@ -23,7 +23,7 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); - setenv("XDG_DATA_HOME", "", 1); + unsetenv("XDG_DATA_HOME"); setenv("HOME", "/home/tmp", 1); efreet_init(); @@ -37,8 +37,8 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); - setenv("XDG_DATA_HOME", "", 1); - setenv("HOME", "", 1); + unsetenv("XDG_DATA_HOME"); + unsetenv("HOME"); efreet_init(); tmp = efreet_data_home_get(); @@ -72,7 +72,7 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); - setenv("XDG_CONFIG_HOME", "", 1); + unsetenv("XDG_CONFIG_HOME"); setenv("HOME", "/home/tmp", 1); efreet_init(); @@ -86,8 +86,8 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); - setenv("XDG_CONFIG_HOME", "", 1); - setenv("HOME", "", 1); + unsetenv("XDG_CONFIG_HOME"); + unsetenv("HOME"); efreet_init(); tmp = efreet_config_home_get(); @@ -121,7 +121,7 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); - setenv("XDG_CACHE_HOME", "", 1); + unsetenv("XDG_CACHE_HOME"); setenv("HOME", "/home/tmp", 1); efreet_init(); @@ -135,8 +135,8 @@ /* reset efreet here so we can set a new home dir */ efreet_shutdown(); - setenv("XDG_CACHE_HOME", "", 1); - setenv("HOME", "", 1); + unsetenv("XDG_CACHE_HOME"); + unsetenv("HOME"); efreet_init(); tmp = efreet_cache_home_get(); @@ -194,7 +194,7 @@ } efreet_shutdown(); - setenv("XDG_DATA_DIRS", "", 1); + unsetenv("XDG_DATA_DIRS"); efreet_init(); i = 0; @@ -267,7 +267,7 @@ } efreet_shutdown(); - setenv("XDG_CONFIG_DIRS", "", 1); + unsetenv("XDG_CONFIG_DIRS"); efreet_init(); i = 0; |
From: Enlightenment C. <no...@cv...> - 2007-03-27 01:30:13
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/doc Log Message: Directory /cvs/e/e17/libs/efreet/doc added to the repository |
From: Enlightenment C. <no...@cv...> - 2007-03-27 01:30:20
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/doc/images Log Message: Directory /cvs/e/e17/libs/efreet/doc/images added to the repository |
From: Enlightenment C. <no...@cv...> - 2007-03-27 01:31:57
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/doc Added Files: .cvsignore e.css foot.html head.html Log Message: - update doxy to be more like web.enlightenment.org |
From: Enlightenment C. <no...@cv...> - 2007-03-27 01:31:57
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/doc/images Added Files: b.png n.gif n.png t.gif t.png tl.gif tl.png Log Message: - update doxy to be more like web.enlightenment.org |
From: Enlightenment C. <no...@cv...> - 2007-03-27 01:32:26
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet Modified Files: Doxyfile gendoc Log Message: - update doxy to be more like web.enlightenment.org =================================================================== RCS file: /cvs/e/e17/libs/efreet/Doxyfile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Doxyfile 24 Mar 2007 19:49:28 -0000 1.3 +++ Doxyfile 27 Mar 2007 01:31:55 -0000 1.4 @@ -115,7 +115,7 @@ # If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = +STRIP_FROM_PATH = src/ # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of # the path mentioned in the documentation of a class, which tells @@ -238,7 +238,7 @@ # If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. -EXTRACT_STATIC = YES +EXTRACT_STATIC = NO # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) # defined locally in source files will be included in the documentation. @@ -287,7 +287,7 @@ # to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. -INTERNAL_DOCS = YES +INTERNAL_DOCS = NO # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate # file names in lower-case letters. If set to YES upper-case letters are also @@ -326,7 +326,7 @@ # by member name. If set to NO (the default) the members will appear in # declaration order. -SORT_BRIEF_DOCS = NO +SORT_BRIEF_DOCS = YES # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be # sorted by fully-qualified names, including namespaces. If set to @@ -474,7 +474,7 @@ # should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. -RECURSIVE = NO +RECURSIVE = YES # The EXCLUDE tag can be used to specify files and/or directories that should # excluded from the INPUT source files. This way you can easily exclude a @@ -520,7 +520,7 @@ # directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = doc/images/ # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program @@ -556,7 +556,7 @@ # Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. -SOURCE_BROWSER = YES +SOURCE_BROWSER = NO # Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. @@ -650,13 +650,13 @@ # each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = +HTML_HEADER = doc/head.html # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = doc/foot.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to @@ -665,7 +665,7 @@ # the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = doc/e.css # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, # files or namespaces will be aligned in HTML using tables. If set to @@ -715,7 +715,7 @@ # top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. -DISABLE_INDEX = NO +DISABLE_INDEX = YES # This tag can be used to set the number of enum values (range [1..20]) # that doxygen will group on one line in the generated HTML documentation. @@ -792,7 +792,7 @@ # contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. -PDF_HYPERLINKS = YES +PDF_HYPERLINKS = NO # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of # plain latex in the generated Makefile. Set this option to YES to get a @@ -1089,7 +1089,7 @@ # inheritance and usage relations if the target is undocumented # or is not a class. -HIDE_UNDOC_RELATIONS = NO +HIDE_UNDOC_RELATIONS = YES # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is # available from the path. This tool is part of Graphviz, a graph visualization @@ -1121,7 +1121,7 @@ # collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. -UML_LOOK = YES +UML_LOOK = NO # If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. @@ -1168,7 +1168,7 @@ # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. -DIRECTORY_GRAPH = NO +DIRECTORY_GRAPH = YES # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. Possible values are png, jpg, or gif =================================================================== RCS file: /cvs/e/e17/libs/efreet/gendoc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- gendoc 3 Feb 2007 13:13:47 -0000 1.1 +++ gendoc 27 Mar 2007 01:31:55 -0000 1.2 @@ -1 +1,10 @@ +#!/bin/sh + doxygen + +if [ ! -e doc/html/images ]; then + mkdir -p doc/html/images +fi + +cp doc/images/*.png doc/images/*.gif doc/html/images + |
From: Enlightenment C. <no...@cv...> - 2007-03-27 01:42:19
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/doc Modified Files: e.css Log Message: - forgot to update ewl before copying over the css file =================================================================== RCS file: /cvs/e/e17/libs/efreet/doc/e.css,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e.css 27 Mar 2007 01:31:55 -0000 1.1 +++ e.css 27 Mar 2007 01:42:17 -0000 1.2 @@ -144,6 +144,7 @@ padding-left: 2px; padding-right: 2px; border: 1px dotted #cccccc; + background-color: #ffffff; } .memname { white-space: nowrap; |
From: Enlightenment C. <no...@cv...> - 2007-03-27 16:54:59
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_icon.c Log Message: - unused =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- efreet_icon.c 26 Mar 2007 22:28:28 -0000 1.5 +++ efreet_icon.c 27 Mar 2007 16:54:54 -0000 1.6 @@ -381,7 +381,6 @@ { char cache_key[PATH_MAX]; const char *key; - Efreet_Icon *value; snprintf(cache_key, sizeof(cache_key), "%s@%dx%d", icon_name, real_size, real_size); key = ecore_string_instance(cache_key); |
From: Enlightenment C. <no...@cv...> - 2007-03-31 03:20:57
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_icon.c Log Message: - formatting =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- efreet_icon.c 31 Mar 2007 01:16:15 -0000 1.7 +++ efreet_icon.c 31 Mar 2007 03:20:53 -0000 1.8 @@ -89,7 +89,7 @@ efreet_icon_themes = ecore_hash_new(NULL, NULL); ecore_hash_set_free_value(efreet_icon_themes, ECORE_FREE_CB(efreet_icon_theme_free)); - efreet_extra_icon_dirs = ecore_list_new(); + efreet_extra_icon_dirs = ecore_list_new(); } return 1; @@ -155,7 +155,7 @@ Ecore_List * efreet_icon_extra_list_get(void) { - return efreet_extra_icon_dirs; + return efreet_extra_icon_dirs; } /** @@ -526,10 +526,11 @@ ecore_list_goto_first(efreet_extra_icon_dirs); while ((dir = ecore_list_next(efreet_extra_icon_dirs))) - { - icon = efreet_icon_fallback_dir_scan(dir, icon_name); - if (icon) return icon; - } + { + icon = efreet_icon_fallback_dir_scan(dir, icon_name); + if (icon) return icon; + } + xdg_dirs = efreet_data_dirs_get(); ecore_list_goto_first(xdg_dirs); while ((dir = ecore_list_next(xdg_dirs))) |
From: Enlightenment C. <no...@cv...> - 2007-04-27 19:48:57
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin Modified Files: ef_menu.c main.c Log Message: - add test case for incorrect menu name. this currently works correctly. - add test case for nested comments with tags inside. this test fails. =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_menu.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ef_menu.c 26 Mar 2007 16:33:00 -0000 1.4 +++ ef_menu.c 27 Apr 2007 19:48:54 -0000 1.5 @@ -45,6 +45,36 @@ } int +ef_cb_menu_with_slashes(void) +{ + Efreet_Menu *menu; + + menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test_menu_slash_bad.menu"); + if (menu) + { + printf("efreet_menu_get() didn't return NULL\n"); + return 0; + } + + return 1; +} + +int +ef_cb_menu_with_bad_comment(void) +{ + Efreet_Menu *menu; + + menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test_menu_bad_comment.menu"); + if (!menu) + { + printf("efreet_menu_get() returned NULL\n"); + return 0; + } + + return 1; +} + +int ef_cb_menu_save(void) { Efreet_Menu *menu; =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- main.c 26 Mar 2007 16:34:45 -0000 1.4 +++ main.c 27 Apr 2007 19:48:54 -0000 1.5 @@ -22,6 +22,8 @@ int ef_cb_desktop_file_id(void); #endif int ef_cb_menu_get(void); +int ef_cb_menu_with_slashes(void); +int ef_cb_menu_with_bad_comment(void); int ef_cb_menu_save(void); #if 0 int ef_cb_menu_edit(void); @@ -56,6 +58,8 @@ {"Desktop File ID", ef_cb_desktop_file_id}, #endif {"Menu Parsing", ef_cb_menu_get}, + {"Menu Incorrect Names", ef_cb_menu_with_slashes}, + {"Menu Bad Comment", ef_cb_menu_with_bad_comment}, {"Menu Save", ef_cb_menu_save}, #if 0 {"Menu Edit", ef_cb_menu_edit}, |
From: Enlightenment C. <no...@cv...> - 2007-04-27 19:48:58
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin/data Modified Files: Makefile.am Added Files: test_menu_bad_comment.menu test_menu_slash_bad.menu Log Message: - add test case for incorrect menu name. this currently works correctly. - add test case for nested comments with tags inside. this test fails. =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/data/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 22 Apr 2007 03:53:01 -0000 1.3 +++ Makefile.am 27 Apr 2007 19:48:54 -0000 1.4 @@ -8,6 +8,8 @@ test.desktop \ test_type.desktop \ test.menu \ +test_menu_bad_comment.menu \ +test_menu_slash_bad.menu \ preferences.menu EXTRA_DIST = $(test_DATA) |
From: Enlightenment C. <no...@cv...> - 2007-06-18 18:01:38
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin Modified Files: ef_data_dirs.c Log Message: - make sure we have the right number of nodes =================================================================== RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_data_dirs.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ef_data_dirs.c 26 Mar 2007 17:00:17 -0000 1.4 +++ ef_data_dirs.c 18 Jun 2007 18:01:37 -0000 1.5 @@ -199,6 +199,12 @@ i = 0; tmp = efreet_data_dirs_get(); + if (ecore_list_nodes(tmp) != 2) + { + printf("efreet_data_dirs_get() nodes is differnet from expected default\n"); + ret = 0; + } + ecore_list_goto_first(tmp); while ((val = ecore_list_next(tmp))) { |