kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm - fix engine config mismatch with new perferred accel vs old engine 

the elm config tool only lets you set accel preference. if you set
none, then the old engine config takes charge, but there is no way to
change/set this, so deprecate the old engine set and don't use it.
this accel preference has been around for a while, so use it now
instead.
This commit is contained in:
Carsten Haitzler 2015-02-07 12:54:11 +09:00
parent 94e9434206
commit 03dbbf034c
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/elementary/src/lib/elm_config.h
View File

@ -838,8 +838,9 @@ EAPI void elm_config_password_show_last_timeout_set(double password_show_la
* applications.
*
* @see elm_config_engine_set()
* @deprecated use elm_config_accel_preference_get() + elm_config_accel_preference_set()
*/
EAPI const char *elm_config_engine_get(void);
EINA_DEPRECATED EAPI const char *elm_config_engine_get(void);
/**
* @brief Set Elementary's rendering engine for use.
@ -850,8 +851,9 @@ EAPI const char *elm_config_engine_get(void);
* this is called.
*
* @see elm_win_add()
* @deprecated use elm_config_accel_preference_get() + elm_config_accel_preference_set()
*/
EAPI void elm_config_engine_set(const char *engine);
EINA_DEPRECATED EAPI void elm_config_engine_set(const char *engine);
/**
* @brief Get Elementary's preferred engine to use.
@ -864,8 +866,9 @@ EAPI void elm_config_engine_set(const char *engine);
* override the engine configured for all applications which.
*
* @see elm_config_preferred_engine_set()
* @deprecated use elm_config_accel_preference_get() + elm_config_accel_preference_set()
*/
EAPI const char *elm_config_preferred_engine_get(void);
EINA_DEPRECATED EAPI const char *elm_config_preferred_engine_get(void);
/**
* @brief Set Elementary's preferred rendering engine for use.
@ -879,8 +882,9 @@ EAPI const char *elm_config_preferred_engine_get(void);
* @see elm_win_add()
* @see elm_config_accel_preference_set()
* @see elm_config_engine_set()
* @deprecated use elm_config_accel_preference_get() + elm_config_accel_preference_set()
*/
EAPI void elm_config_preferred_engine_set(const char *engine);
EINA_DEPRECATED EAPI void elm_config_preferred_engine_set(const char *engine);
/**
* @brief Get Elementary's preferred engine to use.

2
legacy/elementary/src/lib/elm_win.c
View File

@ -89,7 +89,7 @@ static const Elm_Win_Trap *trap = NULL;
} \
}
#define ENGINE_GET() (_elm_preferred_engine ? _elm_preferred_engine : (_elm_config->engine ? _elm_config->engine : ""))
#define ENGINE_GET() (_elm_preferred_engine ? _elm_preferred_engine : "")
typedef struct _Elm_Win_Data Elm_Win_Data;