NorwayFun
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set pointer to config dialogue to NULL when closing 

SVN revision: 19639
This commit is contained in:
Christopher Michael 2006-01-08 09:29:42 +00:00
parent ad90f04ef8
commit 3686bd231f
7 changed files with 70 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/battery/e_mod_config.c
View File

@ -1,5 +1,6 @@
#include "e.h" #include "e.h"
#include "e_mod_main.h" #include "e_mod_main.h"
#include "e_mod_config.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData; typedef struct _cfdata CFData;
@ -26,7 +27,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
void EAPI void
_config_battery_module(E_Container *con, Battery *bat) _config_battery_module(E_Container *con, Battery *bat)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
@ -58,8 +59,8 @@ _fill_data(Battery *b, CFData *cfdata)
} }
} }
static void static void *
*_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; CFData *cfdata;
Battery *b; Battery *b;
@ -73,11 +74,15 @@ static void
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, CFData *cfdata)
{ {
Battery *b;
b = cfd->data;
b->config_dialog = NULL;
free(cfdata); free(cfdata);
} }
static Evas_Object static Evas_Object *
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{ {
Battery *b; Battery *b;
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
@ -108,8 +113,8 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
return 1; return 1;
} }
static Evas_Object static Evas_Object *
*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
Battery *b; Battery *b;

15
src/modules/clock/e_mod_config.c
View File

@ -1,5 +1,6 @@
#include "e.h" #include "e.h"
#include "e_mod_main.h" #include "e_mod_main.h"
#include "e_mod_confg.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData; typedef struct _cfdata CFData;
@ -22,7 +23,7 @@ static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
void EAPI void
_config_clock_module(E_Container *con, Clock_Face *c) _config_clock_module(E_Container *con, Clock_Face *c)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
@ -47,8 +48,8 @@ _fill_data(Clock_Face *clk, CFData *cfdata)
cfdata->digital_style = clk->conf->digitalStyle; cfdata->digital_style = clk->conf->digitalStyle;
} }
static void static void *
*_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; CFData *cfdata;
@ -59,11 +60,15 @@ static void
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, CFData *cfdata)
{ {
Clock_Face *c;
c = cfd->data;
c->config_dialog = NULL;
free(cfdata); free(cfdata);
} }
static Evas_Object static Evas_Object *
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Radio_Group *rg; E_Radio_Group *rg;

15
src/modules/dropshadow/e_mod_config.c
View File

@ -1,5 +1,6 @@
#include "e.h" #include "e.h"
#include "e_mod_main.h" #include "e_mod_main.h"
#include "e_mod_config.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData; typedef struct _cfdata CFData;
@ -26,7 +27,7 @@ static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
void EAPI void
_config_dropshadow_module(E_Container *con, Dropshadow *ds) _config_dropshadow_module(E_Container *con, Dropshadow *ds)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
@ -85,8 +86,8 @@ _fill_data(Dropshadow *ds, CFData *cfdata)
} }
} }
static void static void *
*_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; CFData *cfdata;
Dropshadow *ds; Dropshadow *ds;
@ -100,11 +101,15 @@ static void
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, CFData *cfdata)
{ {
Dropshadow *ds;
ds = cfd->data;
ds->config_dialog = NULL;
free(cfdata); free(cfdata);
} }
static Evas_Object static Evas_Object *
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{ {
Evas_Object *o, *ob, *of; Evas_Object *o, *ob, *of;
E_Radio_Group *rg; E_Radio_Group *rg;

2
src/modules/dropshadow/e_mod_config.h
View File

@ -3,6 +3,6 @@
#ifndef E_MOD_CONFIG_H #ifndef E_MOD_CONFIG_H
#define E_MOD_CONFIG_H #define E_MOD_CONFIG_H
#include "e_mod_main.h" #include "e_mod_main.h"
void _config_dropshadow_module(E_Container *con, Dropshadow *ds); EAPI void _config_dropshadow_module(E_Container *con, Dropshadow *ds);
#endif #endif
#endif #endif

19
src/modules/ibox/e_mod_config.c
View File

@ -1,5 +1,6 @@
#include "e.h" #include "e.h"
#include "e_mod_main.h" #include "e_mod_main.h"
#include "e_mod_config.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData; typedef struct _cfdata CFData;
@ -28,7 +29,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
void EAPI void
_config_ibox_module(E_Container *con, IBox *ibox) _config_ibox_module(E_Container *con, IBox *ibox)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
@ -57,8 +58,8 @@ _fill_data(IBox *ib, CFData *cfdata)
cfdata->autoscroll_speed = ib->conf->autoscroll_speed; cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
} }
static void static void *
*_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; CFData *cfdata;
IBox *ib; IBox *ib;
@ -72,11 +73,15 @@ static void
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, CFData *cfdata)
{ {
IBox *ib;
ib = cfd->data;
ib->config_dialog = NULL;
free(cfdata); free(cfdata);
} }
static Evas_Object static Evas_Object *
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{ {
Evas_Object *o, *ob; Evas_Object *o, *ob;
IBox *ib; IBox *ib;
@ -123,8 +128,8 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
return 1; return 1;
} }
static Evas_Object static Evas_Object *
*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
IBox *ib; IBox *ib;

19
src/modules/pager/e_mod_config.c
View File

@ -1,5 +1,6 @@
#include "e.h" #include "e.h"
#include "e_mod_main.h" #include "e_mod_main.h"
#include "e_mod_config.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData; typedef struct _cfdata CFData;
@ -27,7 +28,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
void EAPI void
_config_pager_module(E_Container *con, Pager *pager) _config_pager_module(E_Container *con, Pager *pager)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
@ -63,8 +64,8 @@ _fill_data(Pager *p, CFData *cfdata)
cfdata->popup_speed = p->conf->popup_speed; cfdata->popup_speed = p->conf->popup_speed;
} }
static void static void *
*_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; CFData *cfdata;
@ -75,11 +76,15 @@ static void
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, CFData *cfdata)
{ {
Pager *p;
p = cfd->data;
p->config_dialog = NULL;
free(cfdata); free(cfdata);
} }
static Evas_Object static Evas_Object *
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -133,8 +138,8 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
return 1; return 1;
} }
static Evas_Object static Evas_Object *
*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Radio_Group *rg; E_Radio_Group *rg;

20
src/modules/temperature/e_mod_config.c
View File

@ -3,6 +3,7 @@
*/ */
#include "e.h" #include "e.h"
#include "e_mod_main.h" #include "e_mod_main.h"
#include "e_mod_config.h"
#include "config.h" #include "config.h"
/* celsius */ /* celsius */
@ -49,7 +50,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
void EAPI void
_config_temperature_module(E_Container *con, Temperature *temp) _config_temperature_module(E_Container *con, Temperature *temp)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
@ -148,8 +149,8 @@ _fill_data(Temperature *t, CFData *cfdata)
} }
} }
static void static void *
*_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; CFData *cfdata;
@ -160,11 +161,15 @@ static void
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, CFData *cfdata)
{ {
Temperature *t;
t = cfd->data;
t->config_dialog = NULL;
free(cfdata); free(cfdata);
} }
static Evas_Object static Evas_Object *
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -284,8 +289,8 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
return 1; return 1;
} }
static Evas_Object static Evas_Object *
*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -388,7 +393,6 @@ static Evas_Object
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
} }
return o; return o;
} }