enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

Fix warnings. 

SVN revision: 19801
This commit is contained in:
sebastid 2006-01-14 16:10:57 +00:00 committed by sebastid
parent 3df39a04d0
commit bbea62a127
8 changed files with 92 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,10 +3,9 @@
#include "e_mod_config.h" #include "e_mod_config.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data; typedef struct _Cfg_File_Data Cfg_File_Data;
struct _cfdata struct _E_Config_Dialog_Data
{ {
int show_alert; int show_alert;
double poll_time; double poll_time;
@ -21,11 +20,11 @@ struct _Cfg_File_Data
/* Protos */ /* Protos */
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void void
_config_battery_module(E_Container *con, Battery *bat) _config_battery_module(E_Container *con, Battery *bat)
@ -45,7 +44,7 @@ _config_battery_module(E_Container *con, Battery *bat)
} }
static void static void
_fill_data(Battery *b, CFData *cfdata) _fill_data(Battery *b, E_Config_Dialog_Data *cfdata)
{ {
cfdata->alarm_time = b->conf->alarm; cfdata->alarm_time = b->conf->alarm;
cfdata->poll_time = b->conf->poll_time; cfdata->poll_time = b->conf->poll_time;
@ -62,17 +61,17 @@ _fill_data(Battery *b, CFData *cfdata)
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; E_Config_Dialog_Data *cfdata;
Battery *b; Battery *b;
b = cfd->data; b = cfd->data;
cfdata = E_NEW(CFData, 1); cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(b, cfdata); _fill_data(b, cfdata);
return cfdata; return cfdata;
} }
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Battery *b; Battery *b;
@ -82,7 +81,7 @@ _free_data(E_Config_Dialog *cfd, CFData *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, E_Config_Dialog_Data *cfdata)
{ {
Battery *b; Battery *b;
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
@ -99,7 +98,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Battery *b; Battery *b;
@ -114,7 +113,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
} }
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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
Battery *b; Battery *b;
@ -146,7 +145,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Battery *b; Battery *b;

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

@ -3,10 +3,9 @@
#include "e_mod_config.h" #include "e_mod_config.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data; typedef struct _Cfg_File_Data Cfg_File_Data;
struct _cfdata struct _E_Config_Dialog_Data
{ {
int digital_style; int digital_style;
}; };
@ -19,9 +18,9 @@ struct _Cfg_File_Data
/* Protos */ /* Protos */
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void void
_config_clock_module(E_Container *con, Clock_Face *c) _config_clock_module(E_Container *con, Clock_Face *c)
@ -43,7 +42,7 @@ _config_clock_module(E_Container *con, Clock_Face *c)
} }
static void static void
_fill_data(Clock_Face *clk, CFData *cfdata) _fill_data(Clock_Face *clk, E_Config_Dialog_Data *cfdata)
{ {
cfdata->digital_style = clk->conf->digitalStyle; cfdata->digital_style = clk->conf->digitalStyle;
} }
@ -51,14 +50,14 @@ _fill_data(Clock_Face *clk, CFData *cfdata)
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(CFData, 1); cfdata = E_NEW(E_Config_Dialog_Data, 1);
return cfdata; return cfdata;
} }
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Clock_Face *c; Clock_Face *c;
@ -68,7 +67,7 @@ _free_data(E_Config_Dialog *cfd, CFData *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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -91,7 +90,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Clock_Face *clk; Clock_Face *clk;

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

@ -3,10 +3,9 @@
#include "e_mod_config.h" #include "e_mod_config.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data; typedef struct _Cfg_File_Data Cfg_File_Data;
struct _cfdata struct _E_Config_Dialog_Data
{ {
int quality; int quality;
int blur_size; int blur_size;
@ -23,9 +22,9 @@ struct _Cfg_File_Data
/* Protos */ /* Protos */
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void void
_config_dropshadow_module(E_Container *con, Dropshadow *ds) _config_dropshadow_module(E_Container *con, Dropshadow *ds)
@ -45,7 +44,7 @@ _config_dropshadow_module(E_Container *con, Dropshadow *ds)
} }
static void static void
_fill_data(Dropshadow *ds, CFData *cfdata) _fill_data(Dropshadow *ds, E_Config_Dialog_Data *cfdata)
{ {
cfdata->quality = ds->conf->quality; cfdata->quality = ds->conf->quality;
cfdata->blur_size = ds->conf->blur_size; cfdata->blur_size = ds->conf->blur_size;
@ -89,17 +88,17 @@ _fill_data(Dropshadow *ds, CFData *cfdata)
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; E_Config_Dialog_Data *cfdata;
Dropshadow *ds; Dropshadow *ds;
ds = cfd->data; ds = cfd->data;
cfdata = E_NEW(CFData, 1); cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(ds, cfdata); _fill_data(ds, cfdata);
return cfdata; return cfdata;
} }
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Dropshadow *ds; Dropshadow *ds;
@ -109,7 +108,7 @@ _free_data(E_Config_Dialog *cfd, CFData *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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *ob, *of; Evas_Object *o, *ob, *of;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -172,7 +171,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Dropshadow *ds; Dropshadow *ds;

7
src/modules/gadget_test/e_mod_main.c
View File

@ -24,9 +24,9 @@ e_modapi_init(E_Module *m)
E_Gadget *gad = NULL; E_Gadget *gad = NULL;
Test *t = E_NEW(Test, 1); Test *t = E_NEW(Test, 1);
if (!t) return; if (!t) return NULL;
api = E_NEW(E_Gadget_Api, 1); api = E_NEW(E_Gadget_Api, 1);
if (!api) return; if (!api) return NULL;
/* /*
* set up gadget -- only module and name are required, but the gadget would * set up gadget -- only module and name are required, but the gadget would
@ -80,10 +80,7 @@ e_modapi_about(E_Module *m)
static void static void
_test_face_init(void *data, E_Gadget_Face *face) _test_face_init(void *data, E_Gadget_Face *face)
{ {
Test *t = data;
e_gadget_face_theme_set(face, "base/theme/modules/clock", "modules/clock/main"); e_gadget_face_theme_set(face, "base/theme/modules/clock", "modules/clock/main");
} }
static void static void

29
src/modules/ibar/e_mod_config.c
View File

@ -3,10 +3,9 @@
#include "e_mod_config.h" #include "e_mod_config.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data; typedef struct _Cfg_File_Data Cfg_File_Data;
struct _cfdata struct _E_Config_Dialog_Data
{ {
int autofit; int autofit;
int follower; int follower;
@ -23,11 +22,11 @@ struct _Cfg_File_Data
/* Protos */ /* Protos */
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void void
_config_ibar_module(E_Container *con, IBar *ibar) _config_ibar_module(E_Container *con, IBar *ibar)
@ -49,7 +48,7 @@ _config_ibar_module(E_Container *con, IBar *ibar)
} }
static void static void
_fill_data(IBar *ib, CFData *cfdata) _fill_data(IBar *ib, E_Config_Dialog_Data *cfdata)
{ {
cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO); cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO);
cfdata->follower = ib->conf->follower; cfdata->follower = ib->conf->follower;
@ -61,17 +60,17 @@ _fill_data(IBar *ib, CFData *cfdata)
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; E_Config_Dialog_Data *cfdata;
IBar *ib; IBar *ib;
ib = cfd->data; ib = cfd->data;
cfdata = E_NEW(CFData, 1); cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(ib, cfdata); _fill_data(ib, cfdata);
return cfdata; return cfdata;
} }
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
IBar *ibar; IBar *ibar;
@ -81,7 +80,7 @@ _free_data(E_Config_Dialog *cfd, CFData *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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *ob; Evas_Object *o, *ob;
IBar *ib; IBar *ib;
@ -98,7 +97,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
IBar *ib; IBar *ib;
@ -129,7 +128,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
} }
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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
IBar *ib; IBar *ib;
@ -165,7 +164,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
IBar *ib; IBar *ib;

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

@ -3,10 +3,9 @@
#include "e_mod_config.h" #include "e_mod_config.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data; typedef struct _Cfg_File_Data Cfg_File_Data;
struct _cfdata struct _E_Config_Dialog_Data
{ {
int autofit; int autofit;
int follower; int follower;
@ -23,11 +22,11 @@ struct _Cfg_File_Data
/* Protos */ /* Protos */
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void void
_config_ibox_module(E_Container *con, IBox *ibox) _config_ibox_module(E_Container *con, IBox *ibox)
@ -49,7 +48,7 @@ _config_ibox_module(E_Container *con, IBox *ibox)
} }
static void static void
_fill_data(IBox *ib, CFData *cfdata) _fill_data(IBox *ib, E_Config_Dialog_Data *cfdata)
{ {
cfdata->autofit = (ib->conf->width == IBOX_WIDTH_AUTO); cfdata->autofit = (ib->conf->width == IBOX_WIDTH_AUTO);
cfdata->follower = ib->conf->follower; cfdata->follower = ib->conf->follower;
@ -61,17 +60,17 @@ _fill_data(IBox *ib, CFData *cfdata)
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; E_Config_Dialog_Data *cfdata;
IBox *ib; IBox *ib;
ib = cfd->data; ib = cfd->data;
cfdata = E_NEW(CFData, 1); cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(ib, cfdata); _fill_data(ib, cfdata);
return cfdata; return cfdata;
} }
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
IBox *ib; IBox *ib;
@ -81,7 +80,7 @@ _free_data(E_Config_Dialog *cfd, CFData *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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *ob; Evas_Object *o, *ob;
IBox *ib; IBox *ib;
@ -98,7 +97,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
IBox *ib; IBox *ib;
@ -129,7 +128,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
} }
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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
IBox *ib; IBox *ib;
@ -165,7 +164,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
IBox *ib; IBox *ib;

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

@ -3,10 +3,9 @@
#include "e_mod_config.h" #include "e_mod_config.h"
#include "config.h" #include "config.h"
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data; typedef struct _Cfg_File_Data Cfg_File_Data;
struct _cfdata struct _E_Config_Dialog_Data
{ {
int show_name; int show_name;
int name_pos; int name_pos;
@ -22,11 +21,11 @@ struct _Cfg_File_Data
/* Protos */ /* Protos */
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void void
_config_pager_module(E_Container *con, Pager *pager) _config_pager_module(E_Container *con, Pager *pager)
@ -46,7 +45,7 @@ _config_pager_module(E_Container *con, Pager *pager)
} }
static void static void
_fill_data(Pager *p, CFData *cfdata) _fill_data(Pager *p, E_Config_Dialog_Data *cfdata)
{ {
/* Name Pos, Show Popup, popup_speed */ /* Name Pos, Show Popup, popup_speed */
cfdata->name_pos = p->conf->deskname_pos; cfdata->name_pos = p->conf->deskname_pos;
@ -67,14 +66,14 @@ _fill_data(Pager *p, CFData *cfdata)
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(CFData, 1); cfdata = E_NEW(E_Config_Dialog_Data, 1);
return cfdata; return cfdata;
} }
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Pager *p; Pager *p;
@ -84,7 +83,7 @@ _free_data(E_Config_Dialog *cfd, CFData *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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -120,7 +119,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Pager *p; Pager *p;
@ -139,7 +138,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
} }
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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -181,7 +180,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Pager *p; Pager *p;

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

@ -17,10 +17,9 @@
#define FAR_2_CEL(x) (x - 32) / 1.8 #define FAR_2_CEL(x) (x - 32) / 1.8
#define CEL_2_FAR(x) (x * 1.8) + 32 #define CEL_2_FAR(x) (x * 1.8) + 32
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data; typedef struct _Cfg_File_Data Cfg_File_Data;
struct _cfdata struct _E_Config_Dialog_Data
{ {
int poll_method; int poll_method;
double poll_time; double poll_time;
@ -44,11 +43,11 @@ struct _Cfg_File_Data
/* Protos */ /* Protos */
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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, E_Config_Dialog_Data *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void void
_config_temperature_module(E_Container *con, Temperature *temp) _config_temperature_module(E_Container *con, Temperature *temp)
@ -68,7 +67,7 @@ _config_temperature_module(E_Container *con, Temperature *temp)
} }
static void static void
_fill_data(Temperature *t, CFData *cfdata) _fill_data(Temperature *t, E_Config_Dialog_Data *cfdata)
{ {
double p; double p;
@ -152,14 +151,14 @@ _fill_data(Temperature *t, CFData *cfdata)
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
CFData *cfdata; E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(CFData, 1); cfdata = E_NEW(E_Config_Dialog_Data, 1);
return cfdata; return cfdata;
} }
static void static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Temperature *t; Temperature *t;
@ -169,7 +168,7 @@ _free_data(E_Config_Dialog *cfd, CFData *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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -253,7 +252,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Temperature *t; Temperature *t;
@ -290,7 +289,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
} }
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, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -397,7 +396,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
} }
static int static int
_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Temperature *t; Temperature *t;