[EGIT] [core/elementary] master 01/01: make actual accel preference work without diplay system set

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=8235b2e048751cefc81fc48f6b502b3c5d295975

commit 8235b2e048751cefc81fc48f6b502b3c5d295975
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Sun Mar 9 14:28:37 2014 +0900

    make actual accel preference work without diplay system set
---
 src/lib/elm_win.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index d4ed38b..62fa5ca 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2897,6 +2897,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
                   (!strcasecmp(_elm_accel_preference, "opengl")) ||
                   (!strcasecmp(_elm_accel_preference, "3d")) ||
                   (!strcasecmp(_elm_accel_preference, "hw")) ||
+                  (!strcasecmp(_elm_accel_preference, "accel")) ||
                   (!strcasecmp(_elm_accel_preference, "hardware")) ||
                   (!strcasecmp(_elm_accel_preference, "accel"))
                  ))
@@ -2920,6 +2921,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
                   (!strcasecmp(_elm_accel_preference, "opengl")) ||
                   (!strcasecmp(_elm_accel_preference, "3d")) ||
                   (!strcasecmp(_elm_accel_preference, "hw")) ||
+                  (!strcasecmp(_elm_accel_preference, "accel")) ||
                   (!strcasecmp(_elm_accel_preference, "hardware")) ||
                   (!strcasecmp(_elm_accel_preference, "accel"))
                  ))
@@ -2949,6 +2951,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
                   (!strcasecmp(_elm_accel_preference, "opengl")) ||
                   (!strcasecmp(_elm_accel_preference, "3d")) ||
                   (!strcasecmp(_elm_accel_preference, "hw")) ||
+                  (!strcasecmp(_elm_accel_preference, "accel")) ||
                   (!strcasecmp(_elm_accel_preference, "hardware")) ||
                   (!strcasecmp(_elm_accel_preference, "accel"))
                  ))
@@ -3002,22 +3005,23 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
           }
         else
           {
+             printf("... %s\n", _elm_accel_preference);
              if ((_elm_accel_preference) &&
                  ((!strcasecmp(_elm_accel_preference, "gl")) ||
                   (!strcasecmp(_elm_accel_preference, "opengl")) ||
                   (!strcasecmp(_elm_accel_preference, "3d")) ||
                   (!strcasecmp(_elm_accel_preference, "hw")) ||
+                  (!strcasecmp(_elm_accel_preference, "accel")) ||
                   (!strcasecmp(_elm_accel_preference, "hardware")) ||
                   (!strcasecmp(_elm_accel_preference, "accel"))
                  ))
                {
-                  enginelist[0] = ENGINE_GET();
-                  enginelist[1] = ELM_OPENGL_X11;
-                  enginelist[2] = ELM_WAYLAND_EGL;
-                  enginelist[3] = ELM_SOFTWARE_FB;
-                  enginelist[4] = ELM_OPENGL_COCOA;
-                  enginelist[5] = ELM_OPENGL_SDL;
-                  enginelist[6] = NULL;
+                  enginelist[0] = ELM_OPENGL_X11;
+                  enginelist[1] = ELM_WAYLAND_EGL;
+                  enginelist[2] = ELM_SOFTWARE_FB;
+                  enginelist[3] = ELM_OPENGL_COCOA;
+                  enginelist[4] = ELM_OPENGL_SDL;
+                  enginelist[5] = NULL;
                }
              else
                {

--