Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src/module
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
destroy a config dialog if open when module is unloaded
also allow only 1 dialog per bar to be open
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.c 30 Dec 2005 20:03:26 -0000 1.1
+++ e_mod_config.c 8 Jan 2006 13:00:28 -0000 1.2
@@ -31,6 +31,9 @@
E_Config_Dialog *cfd;
E_Config_Dialog_View v;
+ if (eb->cfd)
+ return;
+
v.create_cfdata = _create_data;
v.free_cfdata = _free_data;
v.basic.apply_cfdata = _basic_apply_data;
@@ -39,6 +42,7 @@
v.advanced.create_widgets = _advanced_create_widgets;
cfd = e_config_dialog_new(con, "Engage Configuration", NULL, 0, &v, eb);
+ eb->cfd = cfd;
}
static void
@@ -73,9 +77,13 @@
_free_data(E_Config_Dialog *cfd, void *data)
{
CFData *cfdata;
+ Engage_Bar *eb;
cfdata = data;
free(cfdata);
+
+ eb = cfd->data;
+ eb->cfd = NULL;
}
static Evas_Object *
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- e_mod_main.c 8 Jan 2006 12:46:41 -0000 1.106
+++ e_mod_main.c 8 Jan 2006 13:00:28 -0000 1.107
@@ -3,6 +3,7 @@
*/
#include <e.h>
#include "e_mod_main.h"
+#include "e_mod_config.h"
#include "math.h"
#include <unistd.h>
@@ -765,6 +766,11 @@
ecore_event_handler_del(eb->iconify_handler);
ecore_event_handler_del(eb->uniconify_handler);
+ if (eb->cfd)
+ {
+ e_object_del(E_OBJECT(eb->cfd));
+ eb->cfd = NULL;
+ }
free(eb->conf);
free(eb);
bar_count--;
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_mod_main.h 30 Dec 2005 20:03:26 -0000 1.30
+++ e_mod_main.h 8 Jan 2006 13:00:28 -0000 1.31
@@ -85,6 +85,7 @@
enum {ENGAGE_NORMAL, ENGAGE_ZOOMING, ENGAGE_ZOOMED, ENGAGE_UNZOOMING} state;
E_Gadman_Client *gmc;
+ E_Config_Dialog *cfd;
Config_Bar *conf;
Ecore_Event_Handler *add_handler;
@@ -129,6 +130,5 @@
EAPI int e_modapi_about (E_Module *m);
EAPI int e_modapi_config (E_Module *m);
-void _engage_cb_config_update(void *data);
-
+void _engage_cb_config_updated(void *data);
#endif
-------------------------------------------------------
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
