Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : rain

Dir     : e_modules/rain


Modified Files:
        e_mod_main.c e_mod_config.c 


Log Message:
Update to use new e_modapi_config
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/rain/e_mod_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_main.c        12 Dec 2005 21:21:09 -0000      1.4
+++ e_mod_main.c        17 Dec 2005 21:44:08 -0000      1.5
@@ -74,6 +74,19 @@
    return 1;
 }
 
+int
+e_modapi_config(E_Module *m) 
+{
+   Rain *r;
+   E_Container *con;
+   
+   r = m->data;
+   if (!r) return 0;
+   con = e_container_current_get(e_manager_current_get());
+   e_int_config_rain(con, r);
+   return 1;
+}
+
 /* module private routines */
 static Rain *_rain_init(E_Module *m)
 {
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/rain/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 17:55:24 -0000      1.3
+++ e_mod_config.c      17 Dec 2005 21:44:08 -0000      1.4
@@ -11,7 +11,6 @@
 
 struct _cfdata
 {
-   /* Basic */
    int show_clouds;
    int density;
 };
@@ -29,15 +28,12 @@
 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);
 
-Rain *rn = NULL;
-
 void
-  e_int_config_rain(E_Container *con, Rain *r)
+e_int_config_rain(E_Container *con, Rain *r)
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View v;
 
-   rn = r;
    v.create_cfdata = _create_data;
    v.free_cfdata = _free_data;
    v.basic.apply_cfdata = _basic_apply_data;
@@ -49,7 +45,7 @@
 }
 
 static void
-  _fill_data(CFData *cfdata)
+_fill_data(Rain *rn, CFData *cfdata)
 {
    cfdata->show_clouds = rn->conf->show_clouds;
    switch (rn->conf->cloud_count)
@@ -69,23 +65,25 @@
 }
 
 static void
-  *_create_data(E_Config_Dialog *cfd)
+*_create_data(E_Config_Dialog *cfd)
 {
    CFData *cfdata;
-
+   Rain *r;
+   
+   r = cfd->data;
    cfdata = E_NEW(CFData, 1);
-   _fill_data(cfdata);
+   _fill_data(r, cfdata);
    return cfdata;
 }
 
 static void
-  _free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, CFData *cfdata)
 {
    free(cfdata);
 }
 
 static Evas_Object
-  *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
@@ -111,8 +109,11 @@
 }
 
 static int
-  _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 {
+   Rain *rn;
+   
+   rn = cfd->data;
    e_border_button_bindings_ungrab_all();
    switch (cfdata->density)
      {




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