Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src/module
Modified Files:
e_mod_config.c
Log Message:
use E_Config_Dialog_Data
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_config.c 22 Jan 2006 18:20:59 -0000 1.3
+++ e_mod_config.c 25 Feb 2006 18:55:47 -0000 1.4
@@ -1,10 +1,8 @@
-#include "e.h"
+#include <e.h>
#include "e_mod_main.h"
#include "config.h"
-typedef struct _cfdata CFData;
-
-struct _cfdata
+struct _E_Config_Dialog_Data
{
int click_focus;
@@ -20,11 +18,11 @@
/* Protos */
static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, void *data);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
void *data);
-static int _basic_apply_data(E_Config_Dialog *cfd, void *data);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
void *data);
-static int _advanced_apply_data(E_Config_Dialog *cfd, void *data);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *data);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*data);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *data);
+static int _advanced_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *data);
void _engage_module_config(E_Container *con, Engage_Bar *eb)
{
@@ -50,7 +48,7 @@
}
static void
-_fill_data(Engage_Bar *eb, CFData *cfdata)
+_fill_data(Engage_Bar *eb, E_Config_Dialog_Data *cfdata)
{
cfdata->click_focus = eb->engage->conf->click_focus;
@@ -68,22 +66,16 @@
static void *
_create_data(E_Config_Dialog *cfd)
{
- CFData *cfdata;
- Engage_Bar *eb;
-
- eb = cfd->data;
- cfdata = E_NEW(CFData, 1);
- _fill_data(eb, cfdata);
+ E_Config_Dialog_Data *cfdata;
+ cfdata = E_NEW(E_Config_Dialog_Data, 1);
return cfdata;
}
static void
-_free_data(E_Config_Dialog *cfd, void *data)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- CFData *cfdata;
Engage_Bar *eb;
- cfdata = data;
free(cfdata);
eb = cfd->data;
@@ -91,10 +83,10 @@
}
static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*data)
{
Evas_Object *o, *of, *ob;
- CFData *cfdata;
+ E_Config_Dialog_Data *cfdata;
Engage_Bar *eb;
eb = cfd->data;
@@ -133,12 +125,10 @@
}
static int
-_basic_apply_data(E_Config_Dialog *cfd, void *data)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- CFData *cfdata;
Engage_Bar *eb;
- cfdata = data;
eb = cfd->data;
eb->engage->conf->click_focus = cfdata->click_focus;
@@ -154,14 +144,12 @@
}
static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob;
- CFData *cfdata;
Engage_Bar *eb;
eb = cfd->data;
- cfdata = data;
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, "Global Options", 0);
@@ -204,12 +192,10 @@
}
static int
-_advanced_apply_data(E_Config_Dialog *cfd, void *data)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- CFData *cfdata;
Engage_Bar *eb;
- cfdata = data;
eb = cfd->data;
eb->engage->conf->click_focus = cfdata->click_focus;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
