Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : screenshot

Dir     : e_modules/screenshot


Modified Files:
        e_mod_config.c 


Log Message:
The great E_Config_Dialog_Data fix
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_config.c      8 Jan 2006 10:31:41 -0000       1.8
+++ e_mod_config.c      15 Jan 2006 08:32:19 -0000      1.9
@@ -1,4 +1,4 @@
-#include "e.h"
+#include <e.h>
 #include "e_mod_main.h"
 #include "e_mod_config.h"
 #include "config.h"
@@ -6,10 +6,9 @@
 #define S_METHOD_IMPORT 0
 #define S_METHOD_SCROT 1
 
-typedef struct _cfdata CFData;
 typedef struct _Cfg_File_Data Cfg_File_Data;
 
-struct _cfdata
+struct _E_Config_Dialog_Data
 {
    Screen *screen;
 
@@ -52,11 +51,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);
 
 /* Config Calls */
 void 
@@ -79,7 +78,7 @@
 }
 
 static void
-_fill_data(Screen *sc, CFData *cfdata)
+_fill_data(Screen *sc, E_Config_Dialog_Data *cfdata)
 {
    if (sc->conf->use_import == 1)
      {
@@ -129,18 +128,16 @@
 static void *
 _create_data(E_Config_Dialog *cfd)
 {
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    Screen *s;
    
    s = cfd->data;
-   cfdata = E_NEW(CFData, 1);
-   _fill_data(s, 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)
 {
    Screen *s;
    
@@ -151,7 +148,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, *ot;
    E_Radio_Group *rg;
@@ -210,7 +207,7 @@
 }
 
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    char tmp[4096];
    int length;
@@ -271,7 +268,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, *ob, *of, *ot;
    E_Radio_Group *rg;
@@ -357,7 +354,7 @@
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    Screen *sc;
    




-------------------------------------------------------
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

Reply via email to