Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_config_dialog.h e_configure.c e_configure.h Log Message: add generic cfg call =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_config_dialog.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_config_dialog.h 30 Nov 2006 10:01:01 -0000 1.16 +++ e_config_dialog.h 30 Apr 2008 12:01:32 -0000 1.17 @@ -6,7 +6,8 @@ typedef enum _E_Config_Dialog_CFData_Type { E_CONFIG_DIALOG_CFDATA_TYPE_BASIC, - E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED + E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED, + E_CONFIG_DIALOG_CFDATA_TYPE_NORMAL_WINDOW } E_Config_Dialog_CFData_Type; typedef struct _E_Config_Dialog E_Config_Dialog; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.115 retrieving revision 1.116 diff -u -3 -r1.115 -r1.116 --- e_configure.c 1 Nov 2007 20:35:08 -0000 1.115 +++ e_configure.c 30 Apr 2008 12:01:32 -0000 1.116 @@ -9,8 +9,8 @@ e_configure_registry_item_add("extensions/modules", 10, _("Modules"), NULL, "enlightenment/modules", e_int_config_modules); } -EAPI void -e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params)) +static void +_e_configure_registry_item_full_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params), void (*generic_func) (E_Container *con, const char *params)) { Evas_List *l; char *cat; @@ -30,6 +30,7 @@ if (icon_file) eci->icon_file = evas_stringshare_add(icon_file); if (icon) eci->icon = evas_stringshare_add(icon); eci->func = func; + eci->generic_func = generic_func; for (l = e_configure_registry; l; l = l->next) { @@ -60,6 +61,18 @@ } EAPI void +e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params)) +{ + _e_configure_registry_item_full_add(path, pri, label, icon_file, icon, func, NULL); +} + +EAPI void +e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func) (E_Container *con, const char *params)) +{ + _e_configure_registry_item_full_add(path, pri, label, icon_file, icon, NULL, generic_func); +} + +EAPI void e_configure_registry_item_del(const char *path) { Evas_List *l; @@ -187,6 +200,7 @@ if (!strcmp(item, eci->item)) { if (eci->func) eci->func(con, params); + else if (eci->generic_func) eci->generic_func(con, params); goto done; } } =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_configure.h 5 Aug 2007 08:07:39 -0000 1.10 +++ e_configure.h 30 Apr 2008 12:01:32 -0000 1.11 @@ -25,9 +25,11 @@ const char *icon_file; const char *icon; E_Config_Dialog *(*func) (E_Container *con, const char *params); + void (*generic_func) (E_Container *con, const char *params); }; EAPI void e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params)); +EAPI void e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func) (E_Container *con, const char *params)); EAPI void e_configure_registry_item_del(const char *path); EAPI void e_configure_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon); EAPI void e_configure_registry_category_del(const char *path); ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs