Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/cpufreq
Modified Files:
e_mod_main.c
Log Message:
more paranoid cleanup of menus
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/e_mod_main.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_mod_main.c 20 Apr 2006 11:30:24 -0000 1.35
+++ e_mod_main.c 21 Apr 2006 15:54:11 -0000 1.36
@@ -874,11 +874,30 @@
if (cpufreq_config->frequency_check_timer)
ecore_timer_del(cpufreq_config->frequency_check_timer);
- if (cpufreq_config->menu) e_object_del(E_OBJECT(cpufreq_config->menu));
- if (cpufreq_config->menu_poll)
e_object_del(E_OBJECT(cpufreq_config->menu_poll));
- if (cpufreq_config->menu_governor)
e_object_del(E_OBJECT(cpufreq_config->menu_governor));
- if (cpufreq_config->menu_frequency)
e_object_del(E_OBJECT(cpufreq_config->menu_frequency));
- if (cpufreq_config->status) _cpufreq_status_free(cpufreq_config->status);
+ if (cpufreq_config->menu)
+ {
+ e_menu_post_deactivate_callback_set(cpufreq_config->menu, NULL, NULL);
+ e_object_del(E_OBJECT(cpufreq_config->menu));
+ cpufreq_config->menu = NULL;
+ }
+ if (cpufreq_config->menu_poll)
+ {
+ e_menu_post_deactivate_callback_set(cpufreq_config->menu_poll, NULL,
NULL);
+ e_object_del(E_OBJECT(cpufreq_config->menu_poll));
+ cpufreq_config->menu_poll = NULL;
+ }
+ if (cpufreq_config->menu_governor)
+ {
+ e_menu_post_deactivate_callback_set(cpufreq_config->menu_governor,
NULL, NULL);
+ e_object_del(E_OBJECT(cpufreq_config->menu_governor));
+ cpufreq_config->menu_governor = NULL;
+ }
+ if (cpufreq_config->menu_frequency)
+ {
+ e_menu_post_deactivate_callback_set(cpufreq_config->menu_frequency,
NULL, NULL);
+ e_object_del(E_OBJECT(cpufreq_config->menu_frequency));
+ cpufreq_config->menu_frequency = NULL;
+ }
if (cpufreq_config->governor)
evas_stringshare_del(cpufreq_config->governor);
free(cpufreq_config);
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
