summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-07 13:32:08 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-07 13:32:08 -0500
commit80cc3f230d47bc3f3d049e59adde449694e93b2c (patch)
tree5343606c1f7651e79e4dcaf3eaba42c519e3641f
parentb7bec2ba9a672aac75da6a4a11a17be82b38fc7a (diff)
elm: remove ecore-x init from quicklaunch post-fork
this is invalid for basically every possible case. allow components to naturally call this function as needed @fix
-rw-r--r--src/lib/elementary/elm_main.c33
1 files changed, 0 insertions, 33 deletions
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index bf753d9313..f588c1e95e 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1146,39 +1146,6 @@ elm_quicklaunch_fork(int argc,
1146 evas_init(); 1146 evas_init();
1147 _elm_module_init(); 1147 _elm_module_init();
1148 _elm_config_sub_init(); 1148 _elm_config_sub_init();
1149# ifdef HAVE_ELEMENTARY_X
1150 {
1151 Eina_Bool init_x;
1152 const char *ev = getenv("ELM_DISPLAY");
1153 Eina_Bool have_display = !!getenv("DISPLAY");
1154
1155 if (ev) /* If ELM_DISPLAY is specified */
1156 {
1157 if (!strcmp(ev, "x11")) /* and it is X11 */
1158 {
1159 if (!have_display) /* if there is no $DISPLAY */
1160 {
1161 ERR("$ELM_DISPLAY is set to x11 but $DISPLAY"
1162 " is not set");
1163 init_x = EINA_FALSE;
1164 }
1165 else /* if there is */
1166 init_x = EINA_TRUE;
1167 }
1168 else /* not X11 */
1169 init_x = EINA_FALSE;
1170 }
1171 else /* ELM_DISPLAY not specified */
1172 {
1173 if (have_display) /* If there is a $DISPLAY */
1174 init_x = EINA_TRUE;
1175 else /* No $DISPLAY */
1176 init_x = EINA_FALSE;
1177 }
1178 if (init_x)
1179 ecore_x_init(NULL);
1180 }
1181# endif
1182 ecore_evas_init(); // FIXME: check errors 1149 ecore_evas_init(); // FIXME: check errors
1183 ecore_imf_init(); 1150 ecore_imf_init();
1184#endif 1151#endif