From c66e21aa9accaa8ce241994f5460151891e59b83 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sat, 30 Mar 2013 14:11:07 +0900 Subject: [PATCH] me. valgrind. happy fun times together. methinks we should hasve more people do this. --- src/bin/e_main.c | 22 +++++++++++----------- src/bin/e_menu.c | 1 + 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 4cc6a510a..2df3d9657 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -813,6 +813,17 @@ main(int argc, char **argv) e_container_all_freeze(); TS("E_Container Freeze Done"); + if (e_config->show_splash) + e_init_status_set(_("Setup DND")); + TS("E_Dnd Init"); + if (!e_dnd_init()) + { + e_error_message_show(_("Enlightenment cannot set up its dnd system.\n")); + _e_main_shutdown(-1); + } + TS("E_Dnd Init Done"); + _e_main_shutdown_push(e_dnd_shutdown); + if (e_config->show_splash) e_init_status_set(_("Setup Filemanager")); TS("E_Fm2 Init"); @@ -835,17 +846,6 @@ main(int argc, char **argv) TS("E_Msg Init Done"); _e_main_shutdown_push(e_msg_shutdown); - if (e_config->show_splash) - e_init_status_set(_("Setup DND")); - TS("E_Dnd Init"); - if (!e_dnd_init()) - { - e_error_message_show(_("Enlightenment cannot set up its dnd system.\n")); - _e_main_shutdown(-1); - } - TS("E_Dnd Init Done"); - _e_main_shutdown_push(e_dnd_shutdown); - if (e_config->show_splash) e_init_status_set(_("Setup Grab Input Handling")); TS("E_Grabinput Init"); diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 636bc342c..e333eb8c0 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -1294,6 +1294,7 @@ _e_menu_free(E_Menu *m) } if (m->header.title) eina_stringshare_del(m->header.title); if (m->header.icon_file) eina_stringshare_del(m->header.icon_file); + if (m->dangling_job) ecore_job_del(m->dangling_job); free(m); }