From 28002891d07fc9ff090972221205d02749d4e6be Mon Sep 17 00:00:00 2001 From: kakaroto Date: Sat, 15 Oct 2011 09:48:34 +0000 Subject: [PATCH] Elementary: Use ecore_evas_new if the engine fails instead of hardcoding software-x11 as the fallback git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64092 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_win.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 3bbb54e..6f826e0 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -1349,12 +1349,13 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) win = ELM_NEW(Elm_Win); -#define FALLBACK_TRY(engine) \ - if (!win->ee) \ - do { \ - CRITICAL(engine " engine creation failed. Trying software X11."); \ - elm_engine_set(ELM_SOFTWARE_X11); \ - win->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 1, 1); \ +#define FALLBACK_TRY(engine) \ + if (!win->ee) \ + do { \ + CRITICAL(engine " engine creation failed. Trying default."); \ + win->ee = ecore_evas_new(NULL, 0, 0, 1, 1, NULL); \ + if (win->ee) \ + elm_engine_set(ecore_evas_engine_name_get(win->ee)); \ } while (0) #define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name)) @@ -1388,6 +1389,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) win->client_message_handler = ecore_event_handler_add (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win); #endif + FALLBACK_TRY("Sofware X11"); } else if (ENGINE_COMPARE(ELM_SOFTWARE_FB)) { -- 2.7.4