Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_config.c
Log Message:
Clean up e_mod_config.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_config.c 16 Dec 2005 05:21:12 -0000 1.3
+++ e_mod_config.c 17 Dec 2005 21:53:11 -0000 1.4
@@ -27,16 +27,12 @@
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);
-Battery *b = NULL;
-
void
e_int_config_battery(E_Container *con, Battery *bat)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View v;
- b = bat;
-
v.create_cfdata = _create_data;
v.free_cfdata = _free_data;
v.basic.apply_cfdata = _basic_apply_data;
@@ -44,11 +40,11 @@
v.advanced.apply_cfdata = _advanced_apply_data;
v.advanced.create_widgets = _advanced_create_widgets;
- cfd = e_config_dialog_new(con, _("Battery Module"), NULL, 0, &v, bat);
+ cfd = e_config_dialog_new(con, _("Battery Configuration"), NULL, 0, &v,
bat);
}
static void
-_fill_data(CFData *cfdata)
+_fill_data(Battery *b, CFData *cfdata)
{
cfdata->alarm_time = b->conf->alarm;
cfdata->poll_time = b->conf->poll_time;
@@ -66,7 +62,11 @@
*_create_data(E_Config_Dialog *cfd)
{
CFData *cfdata;
+ Battery *b;
+
+ b = cfd->data;
cfdata = E_NEW(CFData, 1);
+ _fill_data(b, cfdata);
return cfdata;
}
@@ -79,9 +79,11 @@
static Evas_Object
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
+ Battery *b;
Evas_Object *o, *of, *ob;
- _fill_data(cfdata);
+ b = cfd->data;
+ _fill_data(b, cfdata);
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Basic Settings"), 0);
@@ -94,6 +96,9 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
+ Battery *b;
+
+ b = cfd->data;
e_border_button_bindings_ungrab_all();
b->conf->poll_time = 10.0;
e_border_button_bindings_grab_all();
@@ -107,9 +112,11 @@
*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
Evas_Object *o, *of, *ob, *ot;
+ Battery *b;
/* Use Sliders for both cfg options */
- _fill_data(cfdata);
+ b = cfd->data;
+ _fill_data(b, cfdata);
o = e_widget_list_add(evas, 0, 0);
of = e_widget_frametable_add(evas, _("Advanced Settings"), 1);
@@ -136,6 +143,9 @@
static int
_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
+ Battery *b;
+
+ b = cfd->data;
e_border_button_bindings_ungrab_all();
b->conf->poll_time = cfdata->poll_time;
-------------------------------------------------------
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
