Set pointer to config dialogue to NULL when closing

SVN revision: 19639

diff --git a/src/modules/battery/e_mod_config.c b/src/modules/battery/e_mod_config.c
index 0588c21..aeabcdd 100644 (file)
--- a/src/modules/battery/e_mod_config.c
+++ b/src/modules/battery/e_mod_config.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_mod_main.h"
+#include "e_mod_config.h"
 #include "config.h"
 
 typedef struct _cfdata CFData;
@@ -26,7 +27,7 @@ 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);
 
-void
+EAPI void
 _config_battery_module(E_Container *con, Battery *bat) 
 {
    E_Config_Dialog *cfd;
@@ -58,8 +59,8 @@ _fill_data(Battery *b, CFData *cfdata)
      }
 }
 
-static void
-*_create_data(E_Config_Dialog *cfd) 
+static void *
+_create_data(E_Config_Dialog *cfd) 
 {
    CFData *cfdata;
    Battery *b;
@@ -73,11 +74,15 @@ static void
 static void
 _free_data(E_Config_Dialog *cfd, CFData *cfdata) 
 {
+   Battery *b;
+   
+   b = cfd->data;
+   b->config_dialog = NULL;
    free(cfdata);
 }
 
-static Evas_Object
-*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
 {
    Battery *b;
    Evas_Object *o, *of, *ob;
@@ -108,8 +113,8 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
    return 1;
 }
 
-static Evas_Object
-*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+static Evas_Object *
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
 {
    Evas_Object *o, *of, *ob;
    Battery *b;

diff --git a/src/modules/clock/e_mod_config.c b/src/modules/clock/e_mod_config.c
index d8decf4..6474117 100644 (file)
--- a/src/modules/clock/e_mod_config.c
+++ b/src/modules/clock/e_mod_config.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_mod_main.h"
+#include "e_mod_confg.h"
 #include "config.h"
 
 typedef struct _cfdata CFData;
@@ -22,7 +23,7 @@ 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);
 
-void 
+EAPI void 
 _config_clock_module(E_Container *con, Clock_Face *c) 
 {
    E_Config_Dialog *cfd;
@@ -47,8 +48,8 @@ _fill_data(Clock_Face *clk, CFData *cfdata)
    cfdata->digital_style = clk->conf->digitalStyle;
 }
 
-static void 
-*_create_data(E_Config_Dialog *cfd) 
+static void *
+_create_data(E_Config_Dialog *cfd) 
 {
    CFData *cfdata;
    
@@ -59,11 +60,15 @@ static void
 static void 
 _free_data(E_Config_Dialog *cfd, CFData *cfdata) 
 {
+   Clock_Face *c;
+   
+   c = cfd->data;
+   c->config_dialog = NULL;
    free(cfdata);
 }
 
-static Evas_Object 
-*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;

diff --git a/src/modules/dropshadow/e_mod_config.c b/src/modules/dropshadow/e_mod_config.c
index ca66ce4..1c48f09 100644 (file)
--- a/src/modules/dropshadow/e_mod_config.c
+++ b/src/modules/dropshadow/e_mod_config.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_mod_main.h"
+#include "e_mod_config.h"
 #include "config.h"
 
 typedef struct _cfdata CFData;
@@ -26,7 +27,7 @@ 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);
 
-void
+EAPI void
 _config_dropshadow_module(E_Container *con, Dropshadow *ds) 
 {
    E_Config_Dialog *cfd;
@@ -85,8 +86,8 @@ _fill_data(Dropshadow *ds, CFData *cfdata)
      }   
 }
 
-static void
-*_create_data(E_Config_Dialog *cfd) 
+static void *
+_create_data(E_Config_Dialog *cfd) 
 {
    CFData *cfdata;
    Dropshadow *ds;
@@ -100,11 +101,15 @@ static void
 static void
 _free_data(E_Config_Dialog *cfd, CFData *cfdata) 
 {
+   Dropshadow *ds;
+   
+   ds = cfd->data;
+   ds->config_dialog = NULL;
    free(cfdata);
 }
 
-static Evas_Object
-*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
 {
    Evas_Object *o, *ob, *of;
    E_Radio_Group *rg;

diff --git a/src/modules/dropshadow/e_mod_config.h b/src/modules/dropshadow/e_mod_config.h
index 06370f5..5429206 100644 (file)
--- a/src/modules/dropshadow/e_mod_config.h
+++ b/src/modules/dropshadow/e_mod_config.h
@@ -3,6 +3,6 @@
 #ifndef E_MOD_CONFIG_H
 #define E_MOD_CONFIG_H
 #include "e_mod_main.h"
-void _config_dropshadow_module(E_Container *con, Dropshadow *ds);
+EAPI void _config_dropshadow_module(E_Container *con, Dropshadow *ds);
 #endif
 #endif

diff --git a/src/modules/ibox/e_mod_config.c b/src/modules/ibox/e_mod_config.c
index 7f015ba..2140645 100644 (file)
--- a/src/modules/ibox/e_mod_config.c
+++ b/src/modules/ibox/e_mod_config.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_mod_main.h"
+#include "e_mod_config.h"
 #include "config.h"
 
 typedef struct _cfdata CFData;
@@ -28,7 +29,7 @@ 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);
 
-void 
+EAPI void 
 _config_ibox_module(E_Container *con, IBox *ibox)
 {
    E_Config_Dialog *cfd;
@@ -57,8 +58,8 @@ _fill_data(IBox *ib, CFData *cfdata)
    cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
 }
 
-static void 
-*_create_data(E_Config_Dialog *cfd)
+static void *
+_create_data(E_Config_Dialog *cfd)
 {
    CFData *cfdata;
    IBox *ib;
@@ -72,11 +73,15 @@ static void
 static void 
 _free_data(E_Config_Dialog *cfd, CFData *cfdata)
 {
+   IBox *ib;
+   
+   ib = cfd->data;
+   ib->config_dialog = NULL;
    free(cfdata);
 }
 
-static Evas_Object 
-*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 {
    Evas_Object *o, *ob;
    IBox *ib;
@@ -123,8 +128,8 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
    return 1;
 }
 
-static Evas_Object 
-*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+static Evas_Object *
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 {
    Evas_Object *o, *of, *ob;
    IBox *ib;

diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index 540cd48..2694549 100644 (file)
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_mod_main.h"
+#include "e_mod_config.h"
 #include "config.h"
 
 typedef struct _cfdata CFData;
@@ -27,7 +28,7 @@ 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);
 
-void 
+EAPI void 
 _config_pager_module(E_Container *con, Pager *pager)
 {
    E_Config_Dialog *cfd;
@@ -63,8 +64,8 @@ _fill_data(Pager *p, CFData *cfdata)
    cfdata->popup_speed = p->conf->popup_speed;
 }
 
-static void 
-*_create_data(E_Config_Dialog *cfd) 
+static void *
+_create_data(E_Config_Dialog *cfd) 
 {
    CFData *cfdata;
    
@@ -75,11 +76,15 @@ static void
 static void 
 _free_data(E_Config_Dialog *cfd, CFData *cfdata) 
 {
+   Pager *p;
+   
+   p = cfd->data;
+   p->config_dialog = NULL;
    free(cfdata);
 }
 
-static Evas_Object 
-*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
@@ -133,8 +138,8 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
    return 1;
 }
 
-static Evas_Object 
-*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+static Evas_Object *
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;

diff --git a/src/modules/temperature/e_mod_config.c b/src/modules/temperature/e_mod_config.c
index c45d1df..c73d349 100644 (file)
--- a/src/modules/temperature/e_mod_config.c
+++ b/src/modules/temperature/e_mod_config.c
@@ -3,6 +3,7 @@
  */
 #include "e.h"
 #include "e_mod_main.h"
+#include "e_mod_config.h"
 #include "config.h"
 
 /* celsius */
@@ -49,7 +50,7 @@ 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);
 
-void
+EAPI void
 _config_temperature_module(E_Container *con, Temperature *temp) 
 {
    E_Config_Dialog *cfd;
@@ -148,8 +149,8 @@ _fill_data(Temperature *t, CFData *cfdata)
      }
 }
 
-static void
-*_create_data(E_Config_Dialog *cfd) 
+static void *
+_create_data(E_Config_Dialog *cfd) 
 {
    CFData *cfdata;
    
@@ -160,11 +161,15 @@ static void
 static void
 _free_data(E_Config_Dialog *cfd, CFData *cfdata) 
 {
+   Temperature *t;
+   
+   t = cfd->data;
+   t->config_dialog = NULL;
    free(cfdata);
 }
 
-static Evas_Object
-*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
@@ -284,8 +289,8 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
    return 1;
 }
 
-static Evas_Object
-*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+static Evas_Object *
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
@@ -387,8 +392,7 @@ static Evas_Object
        ob = e_widget_slider_add(evas, 1, 0, _("%1.0f C"), 0, 95, 1, 0, NULL, &(cfdata->low_temp), 200);
        e_widget_framelist_object_append(of, ob);
        e_widget_list_object_append(o, of, 1, 1, 0.5);
-     }
-   
+     }  
    return o;
 }