diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c index 295c7c556..3ea081fe5 100644 --- a/src/bin/e_eap_editor.c +++ b/src/bin/e_eap_editor.c @@ -60,7 +60,7 @@ EAPI void e_eap_edit_show(E_Container *con, E_App *a) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; E_App_Edit *editor; if (!con) return; @@ -71,15 +71,19 @@ e_eap_edit_show(E_Container *con, E_App *a) editor->eap = a; editor->img = NULL; - /* methods */ - v.create_cfdata = _e_eap_edit_create_data; - v.free_cfdata = _e_eap_edit_free_data; - v.basic.apply_cfdata = _e_eap_edit_basic_apply_data; - v.basic.create_widgets = _e_eap_edit_basic_create_widgets; - v.advanced.apply_cfdata = _e_eap_edit_advanced_apply_data; - v.advanced.create_widgets = _e_eap_edit_advanced_create_widgets; - /* create config diaolg for NULL object/data */ - cfd = e_config_dialog_new(con, _("Eap Editor"), NULL, 0, &v, editor); + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _e_eap_edit_create_data; + v->free_cfdata = _e_eap_edit_free_data; + v->basic.apply_cfdata = _e_eap_edit_basic_apply_data; + v->basic.create_widgets = _e_eap_edit_basic_create_widgets; + v->advanced.apply_cfdata = _e_eap_edit_advanced_apply_data; + v->advanced.create_widgets = _e_eap_edit_advanced_create_widgets; + /* create config diaolg for NULL object/data */ + cfd = e_config_dialog_new(con, _("Eap Editor"), NULL, 0, v, editor); + } } /* local subsystem functions */ diff --git a/src/bin/e_fileman_smart.c b/src/bin/e_fileman_smart.c index 57f1c8d7c..c9eac649a 100644 --- a/src/bin/e_fileman_smart.c +++ b/src/bin/e_fileman_smart.c @@ -1332,19 +1332,23 @@ _e_fm_file_menu_properties(void *data, E_Menu *m, E_Menu_Item *mi) { E_Fm_Icon *icon; E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; icon = data; - /* methods */ - v.create_cfdata = _e_fm_icon_prop_create_data; - v.free_cfdata = _e_fm_icon_prop_free_data; - v.basic.apply_cfdata = _e_fm_icon_prop_basic_apply_data; - v.basic.create_widgets = _e_fm_icon_prop_basic_create_widgets; - v.advanced.apply_cfdata = _e_fm_icon_prop_advanced_apply_data; - v.advanced.create_widgets = _e_fm_icon_prop_advanced_create_widgets; - /* create config diaolg for NULL object/data */ - cfd = e_config_dialog_new(icon->sd->win->container, _("Properties"), NULL, 0, &v, icon); + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _e_fm_icon_prop_create_data; + v->free_cfdata = _e_fm_icon_prop_free_data; + v->basic.apply_cfdata = _e_fm_icon_prop_basic_apply_data; + v->basic.create_widgets = _e_fm_icon_prop_basic_create_widgets; + v->advanced.apply_cfdata = _e_fm_icon_prop_advanced_apply_data; + v->advanced.create_widgets = _e_fm_icon_prop_advanced_create_widgets; + /* create config diaolg for NULL object/data */ + cfd = e_config_dialog_new(icon->sd->win->container, _("Properties"), NULL, 0, v, icon); + } } static void diff --git a/src/bin/e_int_border_border.c b/src/bin/e_int_border_border.c index 866987e82..0d588542f 100644 --- a/src/bin/e_int_border_border.c +++ b/src/bin/e_int_border_border.c @@ -31,19 +31,21 @@ EAPI void e_int_border_border(E_Border *bd) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; - /* create config diaolg for bd object/data */ - cfd = e_config_dialog_new(bd->zone->container, - _("Window Border Selection"), NULL, 0, &v, bd); - bd->border_border_dialog = cfd; + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + /* create config diaolg for bd object/data */ + cfd = e_config_dialog_new(bd->zone->container, + _("Window Border Selection"), NULL, 0, v, bd); + bd->border_border_dialog = cfd; + } } /**--CREATE--**/ diff --git a/src/bin/e_int_border_locks.c b/src/bin/e_int_border_locks.c index b7100d3c6..9eacf5228 100644 --- a/src/bin/e_int_border_locks.c +++ b/src/bin/e_int_border_locks.c @@ -49,19 +49,23 @@ EAPI void e_int_border_locks(E_Border *bd) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; - /* create config diaolg for bd object/data */ - cfd = e_config_dialog_new(bd->zone->container, - _("Window Locks"), NULL, 0, &v, bd); - bd->border_locks_dialog = cfd; + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + /* create config diaolg for bd object/data */ + cfd = e_config_dialog_new(bd->zone->container, + _("Window Locks"), NULL, 0, v, bd); + bd->border_locks_dialog = cfd; + } } /**--CREATE--**/ diff --git a/src/bin/e_int_border_remember.c b/src/bin/e_int_border_remember.c index baff86a10..350c7b438 100644 --- a/src/bin/e_int_border_remember.c +++ b/src/bin/e_int_border_remember.c @@ -51,19 +51,23 @@ EAPI void e_int_border_remember(E_Border *bd) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; - /* create config dialog for bd object/data */ - cfd = e_config_dialog_new(bd->zone->container, - _("Window Remember"), NULL, 0, &v, bd); - bd->border_remember_dialog = cfd; + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + /* create config dialog for bd object/data */ + cfd = e_config_dialog_new(bd->zone->container, + _("Window Remember"), NULL, 0, v, bd); + bd->border_remember_dialog = cfd; + } } /**--CREATE--**/ diff --git a/src/bin/e_int_config_background_import.c b/src/bin/e_int_config_background_import.c index d11cce83b..316363a34 100644 --- a/src/bin/e_int_config_background_import.c +++ b/src/bin/e_int_config_background_import.c @@ -107,8 +107,6 @@ e_int_config_background_import(E_Config_Dialog *parent) v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(parent->con, _("Import An Image"), NULL, 0, v, NULL); e_dialog_resizable_set(cfd->dia, 1); diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c index d77a9ced7..b99c5297e 100644 --- a/src/bin/e_int_config_modules.c +++ b/src/bin/e_int_config_modules.c @@ -64,9 +64,6 @@ e_int_config_modules(E_Container *con) v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - /* Disable For Now */ - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; /* create config diaolg for NULL object/data */ cfd = e_config_dialog_new(con, _("Module Settings"), NULL, 0, v, NULL); return cfd; diff --git a/src/bin/e_int_config_theme.c b/src/bin/e_int_config_theme.c index e6d3bf243..d2dcc9861 100644 --- a/src/bin/e_int_config_theme.c +++ b/src/bin/e_int_config_theme.c @@ -42,8 +42,6 @@ e_int_config_theme(E_Container *con) v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; /* create config diaolg for NULL object/data */ cfd = e_config_dialog_new(con, _("Theme Selector"), NULL, 0, v, NULL); return cfd; diff --git a/src/modules/clock/e_mod_config.c b/src/modules/clock/e_mod_config.c index 65b1965b9..84a2002f0 100644 --- a/src/modules/clock/e_mod_config.c +++ b/src/modules/clock/e_mod_config.c @@ -36,8 +36,6 @@ _config_clock_module(E_Container *con, Clock_Face *c) v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; /* Create The Dialog */ cfd = e_config_dialog_new(con, _("Clock Configuration"), NULL, 0, v, c); diff --git a/src/modules/dropshadow/e_mod_config.c b/src/modules/dropshadow/e_mod_config.c index 627380144..131c15af4 100644 --- a/src/modules/dropshadow/e_mod_config.c +++ b/src/modules/dropshadow/e_mod_config.c @@ -38,8 +38,6 @@ _config_dropshadow_module(E_Container *con, Dropshadow *ds) v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(con, _("Dropshadow Configuration"), NULL, 0, v, ds); ds->config_dialog = cfd; diff --git a/src/modules/itray/.cvsignore b/src/modules/itray/.cvsignore new file mode 100644 index 000000000..60ebc832f --- /dev/null +++ b/src/modules/itray/.cvsignore @@ -0,0 +1,6 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +module.la diff --git a/src/modules/start/.cvsignore b/src/modules/start/.cvsignore index ca21cf8f9..a2de6f194 100644 --- a/src/modules/start/.cvsignore +++ b/src/modules/start/.cvsignore @@ -1,5 +1,5 @@ module.la -e_mod_main.lo +*.lo Makefile.in Makefile .libs diff --git a/src/modules/start/e_mod_config.c b/src/modules/start/e_mod_config.c index add7cef0d..54b7a7f50 100644 --- a/src/modules/start/e_mod_config.c +++ b/src/modules/start/e_mod_config.c @@ -34,8 +34,6 @@ _config_start_module(E_Container *con, Start *start) v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(con, _("Start Module Configuration"), NULL, 0, v, start); }