summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-09 21:17:28 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-09 21:18:25 +0900
commit6a36de43e7cc9737f26996f7dbff2812b9f55f4b (patch)
tree35a7e5aa6ae4d1fd8f2414ca75c17c007e828bc1
parenta64aa0febc699698f18dedee3ef6be25b8bd6d53 (diff)
fix pulg/socket/inline to work again
-rw-r--r--src/lib/elm_win.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 03ec9deac..2171f476c 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3121,10 +3121,10 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
3121 * pointer */ 3121 * pointer */
3122 if (type == ELM_WIN_INLINED_IMAGE) 3122 if (type == ELM_WIN_INLINED_IMAGE)
3123 _win_inlined_image_set(sd); 3123 _win_inlined_image_set(sd);
3124
3125#ifdef HAVE_ELEMENTARY_X 3124#ifdef HAVE_ELEMENTARY_X
3126 else if (ENGINE_COMPARE(ELM_SOFTWARE_X11) || 3125 else if ((engine) &&
3127 ENGINE_COMPARE(ELM_OPENGL_X11)) 3126 ((!strcmp(engine, ELM_SOFTWARE_X11)) ||
3127 (!strcmp(engine, ELM_OPENGL_X11))))
3128 { 3128 {
3129 sd->x.client_message_handler = ecore_event_handler_add 3129 sd->x.client_message_handler = ecore_event_handler_add
3130 (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, obj); 3130 (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, obj);
@@ -3132,7 +3132,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
3132 (ECORE_X_EVENT_WINDOW_PROPERTY, _elm_win_property_change, obj); 3132 (ECORE_X_EVENT_WINDOW_PROPERTY, _elm_win_property_change, obj);
3133 } 3133 }
3134#endif 3134#endif
3135 else if (!strncmp(ENGINE_GET(), "shot:", 5)) 3135 else if ((engine) && (!strncmp(engine, "shot:", 5)))
3136 _shot_init(sd); 3136 _shot_init(sd);
3137 3137
3138 sd->kbdmode = ELM_WIN_KEYBOARD_UNKNOWN; 3138 sd->kbdmode = ELM_WIN_KEYBOARD_UNKNOWN;
@@ -3233,13 +3233,14 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
3233 _elm_win_list = eina_list_append(_elm_win_list, obj); 3233 _elm_win_list = eina_list_append(_elm_win_list, obj);
3234 _elm_win_count++; 3234 _elm_win_count++;
3235 3235
3236 if (!strcmp(engine, ELM_SOFTWARE_FB)) 3236 if ((engine) && (!strcmp(engine, ELM_SOFTWARE_FB)))
3237 { 3237 {
3238 TRAP(sd, fullscreen_set, 1); 3238 TRAP(sd, fullscreen_set, 1);
3239 } 3239 }
3240 else if ((type != ELM_WIN_INLINED_IMAGE) && 3240 else if ((type != ELM_WIN_INLINED_IMAGE) &&
3241 (!strcmp(engine, ELM_WAYLAND_SHM) || 3241 ((engine) &&
3242 (!strcmp(engine, ELM_WAYLAND_EGL)))) 3242 ((!strcmp(engine, ELM_WAYLAND_SHM) ||
3243 (!strcmp(engine, ELM_WAYLAND_EGL))))))
3243 _elm_win_frame_add(sd, "default"); 3244 _elm_win_frame_add(sd, "default");
3244 3245
3245 if (_elm_config->focus_highlight_enable) 3246 if (_elm_config->focus_highlight_enable)
@@ -3260,7 +3261,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
3260 3261
3261 if ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_ON) || 3262 if ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_ON) ||
3262 ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_AUTO) && 3263 ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_AUTO) &&
3263 (!strcmp(engine, ELM_SOFTWARE_FB)))) 3264 ((engine) && (!strcmp(engine, ELM_SOFTWARE_FB)))))
3264 { 3265 {
3265 Evas_Object *o; 3266 Evas_Object *o;
3266 Evas_Coord mw = 1, mh = 1, hx = 0, hy = 0; 3267 Evas_Coord mw = 1, mh = 1, hx = 0, hy = 0;