summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2014-10-30 07:22:17 +0100
committerCedric BAIL <cedric@osg.samsung.com>2014-10-30 07:24:08 +0100
commit91db0da8849b16d7889629be169b6bdd696b928f (patch)
treeea7e1a73261ddb1b1f4d7ba7ec3b96a02f32737c
parent422182a2d9d3995448bbb14a85716946573b3fce (diff)
quicklaunch: initialize edje earlier.
We do trigger an edje theme open during the first stage of quicklaunch as part of config init apparently. So we better init or we will endup with some really bad memory corruption.
-rw-r--r--src/lib/elm_main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 646969393..a708d12c9 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -620,6 +620,7 @@ elm_quicklaunch_init(int argc,
620 620
621 eet_init(); 621 eet_init();
622 ecore_init(); 622 ecore_init();
623 edje_init();
623 624
624#ifdef HAVE_ELEMENTARY_EMAP 625#ifdef HAVE_ELEMENTARY_EMAP
625 emap_init(); 626 emap_init();
@@ -686,7 +687,6 @@ elm_quicklaunch_sub_init(int argc,
686 { 687 {
687 ecore_app_args_set(argc, (const char **)argv); 688 ecore_app_args_set(argc, (const char **)argv);
688 evas_init(); 689 evas_init();
689 edje_init();
690 _elm_module_init(); 690 _elm_module_init();
691 _elm_config_init(); 691 _elm_config_init();
692 _elm_config_sub_init(); 692 _elm_config_sub_init();
@@ -722,7 +722,6 @@ elm_quicklaunch_sub_shutdown(void)
722 ecore_imf_shutdown(); 722 ecore_imf_shutdown();
723 ecore_evas_shutdown(); 723 ecore_evas_shutdown();
724 _elm_config_sub_shutdown(); 724 _elm_config_sub_shutdown();
725 edje_shutdown();
726 evas_shutdown(); 725 evas_shutdown();
727 } 726 }
728 return _elm_sub_init_count; 727 return _elm_sub_init_count;
@@ -765,6 +764,7 @@ elm_quicklaunch_shutdown(void)
765#endif 764#endif
766 _elm_emotion_shutdown(); 765 _elm_emotion_shutdown();
767 766
767 edje_shutdown();
768 ecore_shutdown(); 768 ecore_shutdown();
769 eet_shutdown(); 769 eet_shutdown();
770 770
@@ -953,7 +953,6 @@ elm_quicklaunch_fork(int argc,
953#ifdef SEMI_BROKEN_QUICKLAUNCH 953#ifdef SEMI_BROKEN_QUICKLAUNCH
954 ecore_app_args_set(argc, (const char **)argv); 954 ecore_app_args_set(argc, (const char **)argv);
955 evas_init(); 955 evas_init();
956 edje_init();
957 _elm_module_init(); 956 _elm_module_init();
958 _elm_config_sub_init(); 957 _elm_config_sub_init();
959# ifdef HAVE_ELEMENTARY_X 958# ifdef HAVE_ELEMENTARY_X