From 4a9f8d3a9aae7227a28a660d066197406224ee82 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Sun, 22 Jan 2006 14:17:43 +0000 Subject: [PATCH] Fixes for E_Config_Dialog_View SVN revision: 19960 --- src/bin/e_int_config_desks.c | 18 ++++++++++-------- src/bin/e_int_config_focus.c | 18 ++++++++++-------- src/bin/e_int_config_general.c | 18 ++++++++++-------- src/bin/e_int_config_menus.c | 18 ++++++++++-------- src/bin/e_int_config_modules.c | 18 ++++++++++-------- src/bin/e_int_config_performance.c | 18 ++++++++++-------- src/bin/e_int_config_theme.c | 18 ++++++++++-------- src/bin/e_int_config_window_display.c | 18 ++++++++++-------- src/bin/e_int_config_window_manipulation.c | 18 ++++++++++-------- src/bin/e_int_config_winlist.c | 18 ++++++++++-------- src/modules/battery/e_mod_config.c | 18 ++++++++++-------- src/modules/clock/e_mod_config.c | 18 ++++++++++-------- src/modules/dropshadow/e_mod_config.c | 18 ++++++++++-------- src/modules/ibar/e_mod_config.c | 18 ++++++++++-------- src/modules/ibox/e_mod_config.c | 18 ++++++++++-------- src/modules/itray/e_mod_config.c | 18 ++++++++++-------- src/modules/pager/e_mod_config.c | 18 ++++++++++-------- src/modules/start/e_mod_config.c | 18 ++++++++++-------- src/modules/temperature/e_mod_config.c | 18 ++++++++++-------- 19 files changed, 190 insertions(+), 152 deletions(-) diff --git a/src/bin/e_int_config_desks.c b/src/bin/e_int_config_desks.c index e0a4c5a4d..cd91adc48 100644 --- a/src/bin/e_int_config_desks.c +++ b/src/bin/e_int_config_desks.c @@ -30,17 +30,19 @@ EAPI E_Config_Dialog * e_int_config_desks(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); /* 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; + 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 NULL object/data */ - cfd = e_config_dialog_new(con, _("Desktop Settings"), NULL, 0, &v, NULL); + cfd = e_config_dialog_new(con, _("Desktop Settings"), NULL, 0, v, NULL); return cfd; } diff --git a/src/bin/e_int_config_focus.c b/src/bin/e_int_config_focus.c index 90da49f0e..849db0661 100644 --- a/src/bin/e_int_config_focus.c +++ b/src/bin/e_int_config_focus.c @@ -30,17 +30,19 @@ EAPI E_Config_Dialog * e_int_config_focus(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); /* 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; + 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 NULL object/data */ - cfd = e_config_dialog_new(con, _("Focus Settings"), NULL, 0, &v, NULL); + cfd = e_config_dialog_new(con, _("Focus Settings"), NULL, 0, v, NULL); return cfd; } diff --git a/src/bin/e_int_config_general.c b/src/bin/e_int_config_general.c index 4867d19f8..899a96061 100644 --- a/src/bin/e_int_config_general.c +++ b/src/bin/e_int_config_general.c @@ -20,16 +20,18 @@ EAPI E_Config_Dialog * e_int_config_general(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - 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; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("General Settings"), NULL, 0, &v, NULL); + 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; + + cfd = e_config_dialog_new(con, _("General Settings"), NULL, 0, v, NULL); return cfd; } diff --git a/src/bin/e_int_config_menus.c b/src/bin/e_int_config_menus.c index a984db1e5..47b761499 100644 --- a/src/bin/e_int_config_menus.c +++ b/src/bin/e_int_config_menus.c @@ -25,16 +25,18 @@ EAPI E_Config_Dialog * e_int_config_menus(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - 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; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Menu Settings"), NULL, 0, &v, NULL); + 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; + + cfd = e_config_dialog_new(con, _("Menu Settings"), NULL, 0, v, NULL); return cfd; } diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c index aea1b263a..d77a9ced7 100644 --- a/src/bin/e_int_config_modules.c +++ b/src/bin/e_int_config_modules.c @@ -55,18 +55,20 @@ EAPI E_Config_Dialog * e_int_config_modules(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + v = E_NEW(E_Config_Dialog_View, 1); + /* 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->create_cfdata = _create_data; + 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; + 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); + cfd = e_config_dialog_new(con, _("Module Settings"), NULL, 0, v, NULL); return cfd; } diff --git a/src/bin/e_int_config_performance.c b/src/bin/e_int_config_performance.c index 207c797d4..0649e09af 100644 --- a/src/bin/e_int_config_performance.c +++ b/src/bin/e_int_config_performance.c @@ -23,16 +23,18 @@ EAPI E_Config_Dialog * e_int_config_performance(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - 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; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Performance Settings"), NULL, 0, &v, NULL); + 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; + + cfd = e_config_dialog_new(con, _("Performance 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 2954570f9..e6d3bf243 100644 --- a/src/bin/e_int_config_theme.c +++ b/src/bin/e_int_config_theme.c @@ -33,17 +33,19 @@ EAPI E_Config_Dialog * e_int_config_theme(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); /* 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; + 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 NULL object/data */ - cfd = e_config_dialog_new(con, _("Theme Selector"), NULL, 0, &v, NULL); + cfd = e_config_dialog_new(con, _("Theme Selector"), NULL, 0, v, NULL); return cfd; } diff --git a/src/bin/e_int_config_window_display.c b/src/bin/e_int_config_window_display.c index 6d2c907e3..ca53807a1 100644 --- a/src/bin/e_int_config_window_display.c +++ b/src/bin/e_int_config_window_display.c @@ -34,17 +34,19 @@ EAPI E_Config_Dialog * e_int_config_window_display(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog, 1); /* 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; + 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 NULL object/data */ - cfd = e_config_dialog_new(con, _("Window Display"), NULL, 0, &v, NULL); + cfd = e_config_dialog_new(con, _("Window Display"), NULL, 0, v, NULL); return cfd; } diff --git a/src/bin/e_int_config_window_manipulation.c b/src/bin/e_int_config_window_manipulation.c index 3b2680db6..2d58eb022 100644 --- a/src/bin/e_int_config_window_manipulation.c +++ b/src/bin/e_int_config_window_manipulation.c @@ -34,17 +34,19 @@ EAPI E_Config_Dialog * e_int_config_window_manipulation(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); /* 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; + 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 NULL object/data */ - cfd = e_config_dialog_new(con, _("Window Manipulation"), NULL, 0, &v, NULL); + cfd = e_config_dialog_new(con, _("Window Manipulation"), NULL, 0, v, NULL); return cfd; } diff --git a/src/bin/e_int_config_winlist.c b/src/bin/e_int_config_winlist.c index a9b126d70..ee9e17963 100644 --- a/src/bin/e_int_config_winlist.c +++ b/src/bin/e_int_config_winlist.c @@ -37,16 +37,18 @@ EAPI E_Config_Dialog * e_int_config_winlist(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - 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; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Window List Settings"), NULL, 0, &v, NULL); + 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; + + cfd = e_config_dialog_new(con, _("Window List Settings"), NULL, 0, v, NULL); return cfd; } diff --git a/src/modules/battery/e_mod_config.c b/src/modules/battery/e_mod_config.c index 9f8f11ad6..d8d955fc5 100644 --- a/src/modules/battery/e_mod_config.c +++ b/src/modules/battery/e_mod_config.c @@ -31,16 +31,18 @@ void _config_battery_module(E_Container *con, Battery *bat) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - 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; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Battery Configuration"), NULL, 0, &v, bat); + 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; + + cfd = e_config_dialog_new(con, _("Battery Configuration"), NULL, 0, v, bat); bat->config_dialog = cfd; } diff --git a/src/modules/clock/e_mod_config.c b/src/modules/clock/e_mod_config.c index 157f5bf6f..65b1965b9 100644 --- a/src/modules/clock/e_mod_config.c +++ b/src/modules/clock/e_mod_config.c @@ -27,18 +27,20 @@ void _config_clock_module(E_Container *con, Clock_Face *c) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); /* Dialog 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; + 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 The Dialog */ - cfd = e_config_dialog_new(con, _("Clock Configuration"), NULL, 0, &v, c); + cfd = e_config_dialog_new(con, _("Clock Configuration"), NULL, 0, v, c); c->config_dialog = cfd; } diff --git a/src/modules/dropshadow/e_mod_config.c b/src/modules/dropshadow/e_mod_config.c index 270564703..627380144 100644 --- a/src/modules/dropshadow/e_mod_config.c +++ b/src/modules/dropshadow/e_mod_config.c @@ -30,16 +30,18 @@ void _config_dropshadow_module(E_Container *con, Dropshadow *ds) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - 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; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Dropshadow Configuration"), NULL, 0, &v, ds); + 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; + + cfd = e_config_dialog_new(con, _("Dropshadow Configuration"), NULL, 0, v, ds); ds->config_dialog = cfd; } diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c index 10118dbba..e5e3bb0fb 100644 --- a/src/modules/ibar/e_mod_config.c +++ b/src/modules/ibar/e_mod_config.c @@ -33,18 +33,20 @@ void _config_ibar_module(E_Container *con, IBar *ibar) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); /* Dialog 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; + 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 The Dialog */ - cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, &v, ibar); + cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, v, ibar); ibar->config_dialog = cfd; } diff --git a/src/modules/ibox/e_mod_config.c b/src/modules/ibox/e_mod_config.c index f076a008f..b51a9f450 100644 --- a/src/modules/ibox/e_mod_config.c +++ b/src/modules/ibox/e_mod_config.c @@ -33,18 +33,20 @@ void _config_ibox_module(E_Container *con, IBox *ibox) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + v = E_NEW(E_Config_Dialog_View, 1); + /* Dialog 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; + 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 The Dialog */ - cfd = e_config_dialog_new(con, _("IBox Configuration"), NULL, 0, &v, ibox); + cfd = e_config_dialog_new(con, _("IBox Configuration"), NULL, 0, v, ibox); ibox->config_dialog = cfd; } diff --git a/src/modules/itray/e_mod_config.c b/src/modules/itray/e_mod_config.c index 7647f87c8..cec34da36 100644 --- a/src/modules/itray/e_mod_config.c +++ b/src/modules/itray/e_mod_config.c @@ -35,18 +35,20 @@ void _config_itray_module(E_Container *con, ITray *itray) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + v = E_NEW(E_Config_Dialog_View, 1); + /* Dialog 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; + 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 The Dialog */ - cfd = e_config_dialog_new(con, _("ITray Configuration"), NULL, 0, &v, itray); + cfd = e_config_dialog_new(con, _("ITray Configuration"), NULL, 0, v, itray); itray->config_dialog = cfd; } diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c index aae61f54e..ec52a8b4a 100644 --- a/src/modules/pager/e_mod_config.c +++ b/src/modules/pager/e_mod_config.c @@ -32,16 +32,18 @@ void _config_pager_module(E_Container *con, Pager *pager) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - 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; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Pager Configuration"), NULL, 0, &v, pager); + 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; + + cfd = e_config_dialog_new(con, _("Pager Configuration"), NULL, 0, v, pager); pager->config_dialog = cfd; } diff --git a/src/modules/start/e_mod_config.c b/src/modules/start/e_mod_config.c index 9826570cf..add7cef0d 100644 --- a/src/modules/start/e_mod_config.c +++ b/src/modules/start/e_mod_config.c @@ -26,16 +26,18 @@ void _config_start_module(E_Container *con, Start *start) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - 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; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Start Module Configuration"), NULL, 0, &v, start); + 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; + + cfd = e_config_dialog_new(con, _("Start Module Configuration"), NULL, 0, v, start); } static void diff --git a/src/modules/temperature/e_mod_config.c b/src/modules/temperature/e_mod_config.c index 4c17d4fd4..7c1ace2ce 100644 --- a/src/modules/temperature/e_mod_config.c +++ b/src/modules/temperature/e_mod_config.c @@ -55,16 +55,18 @@ void _config_temperature_module(E_Container *con, Temperature *temp) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - 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; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Temperature Configuration"), NULL, 0, &v, temp); + 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; + + cfd = e_config_dialog_new(con, _("Temperature Configuration"), NULL, 0, v, temp); temp->config_dialog = cfd; }