Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_misc.c
Log Message:
- cleanups
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_misc.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- ewl_misc.c 2 Mar 2007 02:33:10 -0000 1.84
+++ ewl_misc.c 5 Mar 2007 11:22:58 -0000 1.85
@@ -261,6 +261,7 @@
ERROR:
if (frozen) edje_thaw();
ewl_shutdown();
+
DRETURN_INT(ewl_init_count, DLEVEL_STABLE);
}
@@ -297,9 +298,7 @@
while (ewl_garbage_collect_idler(NULL) > 0)
;
-
- ecore_list_destroy(ewl_embed_list);
- ewl_embed_list = NULL;
+ IF_FREE_LIST(ewl_embed_list);
}
if (idle_enterer)
@@ -324,9 +323,7 @@
/* shutdown all the subsystems */
while ((shutdown = ecore_list_remove_first(shutdown_queue)))
shutdown();
-
- ecore_list_destroy(shutdown_queue);
- shutdown_queue = NULL;
+ IF_FREE_LIST(shutdown_queue);
DRETURN_INT(ewl_init_count, DLEVEL_STABLE);
}
@@ -380,7 +377,8 @@
if (!ewl_embed_list) {
DERROR("EWL has not been initialized. Exiting....\n");
- exit(-1);
+ ewl_main_quit();
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
if (ecore_list_is_empty(ewl_embed_list))
@@ -652,6 +650,8 @@
Ecore_List *names;
char *name;
+ DENTER_FUNCTION(DLEVEL_STABLE);
+
printf("EWL Help\n"
"\t--ewl-backtrace Print a stack trace warnings
occur.\n"
"\t--ewl-debug <level> Set the debugging printf level.\n"
@@ -675,6 +675,8 @@
FREE(name);
}
ecore_list_destroy(names);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
}
/**
@@ -808,8 +810,11 @@
DENTER_FUNCTION(DLEVEL_TESTING);
ecore_list_goto(configure_list, w);
- if (ecore_list_current(configure_list) == w)
+ if (ecore_list_current(configure_list) == w) {
+ ewl_object_queued_remove(EWL_OBJECT(w),
+ EWL_FLAG_QUEUED_CSCHEDULED);
ecore_list_remove(configure_list);
+ }
DLEAVE_FUNCTION(DLEVEL_TESTING);
}
@@ -1066,6 +1071,9 @@
if (ewl_config_cache.gc_reap)
printf("Destroyed %d Evas\n---\n", cleanup);
+ /* We set the ewl_garbage_collect to NULL because when we return 0
+ * (because destroy_list is empty) ecore will cleanup the idler
+ * memory for us. */
if (!ecore_list_nodes(destroy_list))
ewl_garbage_collect = NULL;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
