Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : flame
Dir : e_modules/flame
Modified Files:
e_mod_config.c
Log Message:
Update Config Dialogue for new E_Config_Dialog_Data
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/flame/e_mod_config.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_config.c 8 Jan 2006 10:29:28 -0000 1.13
+++ e_mod_config.c 15 Jan 2006 07:27:40 -0000 1.14
@@ -1,12 +1,11 @@
-#include "e.h"
+#include <e.h>
#include "e_mod_main.h"
#include "e_mod_config.h"
#include "config.h"
-typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data;
-struct _cfdata
+struct _E_Config_Dialog_Data
{
int palette;
int r,g,b;
@@ -19,12 +18,12 @@
};
/* Protos */
-static void *_create_data(E_Config_Dialog *cfd);
-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 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 int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
+static void *_create_data(E_Config_Dialog *cfd);
+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,
E_Config_Dialog_Data *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,
E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
void
_config_flame_module(E_Container *con, Flame *fl)
@@ -43,8 +42,16 @@
fl->config_dialog = cfd;
}
+static void *
+_create_data(E_Config_Dialog *cfd)
+{
+ E_Config_Dialog_Data *cfdata;
+ cfdata = E_NEW(E_Config_Dialog_Data, 1);
+ return cfdata;
+}
+
static void
-_fill_data(Flame *f, CFData *cfdata)
+_fill_data(Flame *f, E_Config_Dialog_Data *cfdata)
{
cfdata->palette = f->conf->palette_type;
cfdata->r = f->conf->r;
@@ -52,20 +59,8 @@
cfdata->b = f->conf->b;
}
-static void *
-_create_data(E_Config_Dialog *cfd)
-{
- CFData *cfdata;
- Flame *f;
-
- f = cfd->data;
- cfdata = E_NEW(CFData, 1);
- //_fill_data(f, cfdata);
- return cfdata;
-}
-
static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
Flame *f;
@@ -75,7 +70,7 @@
}
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;
E_Radio_Group *rg;
@@ -104,7 +99,7 @@
}
static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
Flame *f;
@@ -153,7 +148,7 @@
}
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;
Flame *f;
@@ -184,7 +179,7 @@
}
static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
Flame *f;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
