summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-11-07 15:55:25 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-11-07 16:08:39 -0800
commit50cc85f426e736d7ffafc8e7441392910cd278f0 (patch)
treeef082b3adfc5c2ac1a5cde88678c842f2ccbd034 /src/lib/elementary
parente32dd07c9d277b99d54cf5d7215e0acfd5075ee3 (diff)
elementary: fix quicklaunch support.devs/subhransu/vector_workdevs/subhransu/font
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/elm_main.c32
1 files changed, 13 insertions, 19 deletions
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index ac60653516..d91d423407 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -730,7 +730,7 @@ elm_quicklaunch_mode_get(void)
730} 730}
731 731
732EAPI int 732EAPI int
733elm_quicklaunch_init(int argc, 733elm_quicklaunch_init(int argc EINA_UNUSED,
734 char **argv) 734 char **argv)
735{ 735{
736 _elm_ql_init_count++; 736 _elm_ql_init_count++;
@@ -745,6 +745,8 @@ elm_quicklaunch_init(int argc,
745 745
746 eet_init(); 746 eet_init();
747 ecore_init(); 747 ecore_init();
748 edje_init();
749 eio_init();
748 750
749#ifdef HAVE_ELEMENTARY_EMAP 751#ifdef HAVE_ELEMENTARY_EMAP
750 emap_init(); 752 emap_init();
@@ -760,7 +762,6 @@ elm_quicklaunch_init(int argc,
760 762
761 if (!ecore_file_init()) 763 if (!ecore_file_init())
762 ERR("Elementary cannot init ecore_file"); 764 ERR("Elementary cannot init ecore_file");
763 eio_init();
764 765
765 _elm_exit_handler = 766 _elm_exit_handler =
766 ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _elm_signal_exit, NULL); 767 ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _elm_signal_exit, NULL);
@@ -798,21 +799,14 @@ elm_quicklaunch_sub_init(int argc,
798{ 799{
799 _elm_sub_init_count++; 800 _elm_sub_init_count++;
800 if (_elm_sub_init_count > 1) return _elm_sub_init_count; 801 if (_elm_sub_init_count > 1) return _elm_sub_init_count;
801 if (quicklaunch_on) 802 _elm_config_init();
802 { 803 ecore_main_loop_iterate();
803// _elm_config_init();
804//#ifdef SEMI_BROKEN_QUICKLAUNCH
805// return _elm_sub_init_count;
806//#endif
807 }
808 804
809 if (!quicklaunch_on) 805 if (!quicklaunch_on)
810 { 806 {
811 ecore_evas_init(); // FIXME: check errors 807 ecore_evas_init(); // FIXME: check errors
812 edje_init();
813 elm_color_class_init(); 808 elm_color_class_init();
814 _elm_module_init(); 809 _elm_module_init();
815 _elm_config_init();
816 _elm_config_sub_init(); 810 _elm_config_sub_init();
817 ecore_imf_init(); 811 ecore_imf_init();
818 ecore_con_init(); 812 ecore_con_init();
@@ -830,12 +824,6 @@ elm_quicklaunch_sub_shutdown(void)
830{ 824{
831 _elm_sub_init_count--; 825 _elm_sub_init_count--;
832 if (_elm_sub_init_count > 0) return _elm_sub_init_count; 826 if (_elm_sub_init_count > 0) return _elm_sub_init_count;
833 if (quicklaunch_on)
834 {
835//#ifdef SEMI_BROKEN_QUICKLAUNCH
836// return _elm_sub_init_count;
837//#endif
838 }
839 if (!quicklaunch_on) 827 if (!quicklaunch_on)
840 { 828 {
841 _elm_win_shutdown(); 829 _elm_win_shutdown();
@@ -846,12 +834,15 @@ elm_quicklaunch_sub_shutdown(void)
846 edje_shutdown(); 834 edje_shutdown();
847 ecore_evas_shutdown(); 835 ecore_evas_shutdown();
848 _elm_config_sub_shutdown(); 836 _elm_config_sub_shutdown();
849 _elm_config_shutdown();
850 _elm_module_shutdown(); 837 _elm_module_shutdown();
851 if (_elm_prefs_initted) 838 if (_elm_prefs_initted)
852 _elm_prefs_shutdown(); 839 _elm_prefs_shutdown();
853 elm_color_class_shutdown(); 840 elm_color_class_shutdown();
854 } 841 }
842
843 _elm_config_shutdown();
844 ecore_main_loop_iterate();
845
855 return _elm_sub_init_count; 846 return _elm_sub_init_count;
856} 847}
857 848
@@ -1111,6 +1102,7 @@ elm_quicklaunch_fork(int argc,
1111 int i; 1102 int i;
1112 char **args; 1103 char **args;
1113 1104
1105 WRN("No main function found.");
1114 child = fork(); 1106 child = fork();
1115 if (child > 0) return EINA_TRUE; 1107 if (child > 0) return EINA_TRUE;
1116 else if (child < 0) 1108 else if (child < 0)
@@ -1128,6 +1120,8 @@ elm_quicklaunch_fork(int argc,
1128 ERR("failed to execute '%s': %s", argv[0], strerror(errno)); 1120 ERR("failed to execute '%s': %s", argv[0], strerror(errno));
1129 exit(-1); 1121 exit(-1);
1130 } 1122 }
1123 INF("Main function found (legacy: %p, efl: %p)",
1124 qr_main, qre_main);
1131 child = fork(); 1125 child = fork();
1132 if (child > 0) return EINA_TRUE; 1126 if (child > 0) return EINA_TRUE;
1133 else if (child < 0) 1127 else if (child < 0)
@@ -1137,8 +1131,8 @@ elm_quicklaunch_fork(int argc,
1137 } 1131 }
1138 if (postfork_func) postfork_func(postfork_data); 1132 if (postfork_func) postfork_func(postfork_data);
1139 1133
1140 ecore_fork_reset();
1141 eina_main_loop_define(); 1134 eina_main_loop_define();
1135 ecore_fork_reset();
1142 1136
1143 if (quicklaunch_on) 1137 if (quicklaunch_on)
1144 { 1138 {