From: Enlightenment C. <no...@cv...> - 2008-08-13 18:31:16
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_theme Modified Files: e_int_config_theme.c e_int_config_theme_import.c e_int_config_theme_web.c Log Message: Web dialog returns an E_Dialog object, not E_Win. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_int_config_theme.c 2 Jul 2008 11:29:14 -0000 1.13 +++ e_int_config_theme.c 13 Aug 2008 18:31:15 -0000 1.14 @@ -4,6 +4,7 @@ #include "e.h" #include "e_int_config_theme_import.h" +#include "e_int_config_theme_web.h" static void *_create_data (E_Config_Dialog *cfd); static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); @@ -36,8 +37,8 @@ Evas_List *parts_list; /* Dialog */ - E_Win *win_import; - E_Win *win_web; + E_Win *win_import; + E_Dialog *dia_web; }; EAPI E_Config_Dialog * @@ -78,7 +79,7 @@ E_Config_Dialog_Data *cfdata; cfdata = dia->cfdata; - cfdata->win_web = NULL; + cfdata->dia_web = NULL; } EAPI void @@ -262,10 +263,10 @@ E_Config_Dialog_Data *cfdata; cfdata = data1; - if (cfdata->win_web) - e_win_raise(cfdata->win_web); + if (cfdata->dia_web) + e_dialog_raise(cfdata->dia_web); else - cfdata->win_web = e_int_config_theme_web(cfdata->cfd); + cfdata->dia_web = e_int_config_theme_web(cfdata->cfd); } static void =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme_import.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_theme_import.c 25 Jul 2007 17:00:51 -0000 1.3 +++ e_int_config_theme_import.c 13 Aug 2008 18:31:15 -0000 1.4 @@ -1,5 +1,6 @@ #include "e.h" #include "e_int_config_theme.h" +#include "e_int_config_theme_import.h" typedef struct _Import Import; =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme_web.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_theme_web.c 2 Jul 2008 12:43:33 -0000 1.1 +++ e_int_config_theme_web.c 13 Aug 2008 18:31:15 -0000 1.2 @@ -4,6 +4,7 @@ #include "e.h" #include "e_int_config_theme.h" +#include "e_int_config_theme_web.h" #define MAGIC_WEB 0x425581cb #define TEMPLATE "/tmp/themeXXXXXX" |