Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mount
Dir : e_modules/mount
Modified Files:
e_mod_config.c
Log Message:
Formatting and the great E_Config_Dialog_Data fix
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/mount/e_mod_config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_config.c 8 Jan 2006 10:30:27 -0000 1.5
+++ e_mod_config.c 15 Jan 2006 08:19:25 -0000 1.6
@@ -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 iconsize;
int orientation;
@@ -21,11 +20,11 @@
/* 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 _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_mount_module(E_Container *con, Mount *m)
@@ -45,7 +44,7 @@
}
static void
-_fill_data(Mount *m, CFData *cfdata)
+_fill_data(Mount *m, E_Config_Dialog_Data *cfdata)
{
cfdata->iconsize = m->conf->icon_size;
cfdata->orientation = m->conf->orientation;
@@ -55,17 +54,16 @@
static void *
_create_data(E_Config_Dialog *cfd)
{
- CFData *cfdata;
+ E_Config_Dialog_Data *cfdata;
Mount *m;
m = cfd->data;
- cfdata = E_NEW(CFData, 1);
- _fill_data(m, cfdata);
+ cfdata = E_NEW(E_Config_Dialog_Data, 1);
return cfdata;
}
static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
Mount *m;
@@ -75,11 +73,15 @@
}
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;
E_Radio_Group *rg;
-
+ Mount *m;
+
+ m = cfd->data;
+ _fill_data(m, cfdata);
+
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0);
ob = e_widget_check_add(evas, _("Show Labels"), &(cfdata->show_labels));
@@ -98,7 +100,7 @@
}
static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
Mount *m;
@@ -114,10 +116,14 @@
}
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, *ob, *of;
E_Radio_Group *rg;
+ Mount *m;
+
+ m = cfd->data;
+ _fill_data(m, cfdata);
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0);
@@ -141,7 +147,7 @@
}
static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
Mount *m;
@@ -156,6 +162,3 @@
_mount_cb_config_updated(m);
return 1;
}
-
-
-
-------------------------------------------------------
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
