Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/clock
Modified Files:
e_mod_main.h e_mod_main.c e_mod_config.c
Log Message:
If a module has a config dialogue, destroy it on module shutdown
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_mod_main.h 27 Dec 2005 17:16:57 -0000 1.15
+++ e_mod_main.h 6 Jan 2006 21:26:28 -0000 1.16
@@ -42,6 +42,7 @@
Evas_Object *event_object;
E_Gadman_Client *gmc;
+ E_Config_Dialog *config_dialog;
};
EAPI extern E_Module_Api e_modapi;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_mod_main.c 31 Dec 2005 11:51:23 -0000 1.49
+++ e_mod_main.c 6 Jan 2006 21:26:28 -0000 1.50
@@ -62,9 +62,10 @@
module->config_menu = NULL;
clock = module->data;
- if (clock)
- _clock_shutdown(clock);
-
+ if (clock)
+ {
+ _clock_shutdown(clock);
+ }
return 1;
}
@@ -295,6 +296,11 @@
static void
_clock_face_free(Clock_Face *face)
{
+ if (face->config_dialog)
+ {
+ e_object_del(E_OBJECT(face->config_dialog));
+ face->config_dialog = NULL;
+ }
e_object_unref(E_OBJECT(face->con));
e_object_del(E_OBJECT(face->gmc));
evas_object_del(face->clock_object);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_config.c 24 Dec 2005 19:47:42 -0000 1.6
+++ e_mod_config.c 6 Jan 2006 21:26:28 -0000 1.7
@@ -38,6 +38,7 @@
/* Create The Dialog */
cfd = e_config_dialog_new(con, _("Clock Configuration"), NULL, 0, &v, c);
+ c->config_dialog = cfd;
}
static void
-------------------------------------------------------
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
