summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-02-07 12:54:11 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-02-07 13:00:21 +0900
commit51625ba069345faa91044e5f1272e0ecaff0102b (patch)
tree10d226187f0361137504586ffd8531f062d8b52d
parent03b7abad72be381dab906b68f9df3f76036d6c43 (diff)
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.
-rw-r--r--src/lib/elm_config.h12
-rw-r--r--src/lib/elm_win.c2
2 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h
index 0f43c5c87..aa1e1b0d3 100644
--- a/src/lib/elm_config.h
+++ b/src/lib/elm_config.h
@@ -838,8 +838,9 @@ EAPI void elm_config_password_show_last_timeout_set(double password_show_la
838 * applications. 838 * applications.
839 * 839 *
840 * @see elm_config_engine_set() 840 * @see elm_config_engine_set()
841 * @deprecated use elm_config_accel_preference_get() + elm_config_accel_preference_set()
841 */ 842 */
842EAPI const char *elm_config_engine_get(void); 843EINA_DEPRECATED EAPI const char *elm_config_engine_get(void);
843 844
844/** 845/**
845 * @brief Set Elementary's rendering engine for use. 846 * @brief Set Elementary's rendering engine for use.
@@ -850,8 +851,9 @@ EAPI const char *elm_config_engine_get(void);
850 * this is called. 851 * this is called.
851 * 852 *
852 * @see elm_win_add() 853 * @see elm_win_add()
854 * @deprecated use elm_config_accel_preference_get() + elm_config_accel_preference_set()
853 */ 855 */
854EAPI void elm_config_engine_set(const char *engine); 856EINA_DEPRECATED EAPI void elm_config_engine_set(const char *engine);
855 857
856/** 858/**
857 * @brief Get Elementary's preferred engine to use. 859 * @brief Get Elementary's preferred engine to use.
@@ -864,8 +866,9 @@ EAPI void elm_config_engine_set(const char *engine);
864 * override the engine configured for all applications which. 866 * override the engine configured for all applications which.
865 * 867 *
866 * @see elm_config_preferred_engine_set() 868 * @see elm_config_preferred_engine_set()
869 * @deprecated use elm_config_accel_preference_get() + elm_config_accel_preference_set()
867 */ 870 */
868EAPI const char *elm_config_preferred_engine_get(void); 871EINA_DEPRECATED EAPI const char *elm_config_preferred_engine_get(void);
869 872
870/** 873/**
871 * @brief Set Elementary's preferred rendering engine for use. 874 * @brief Set Elementary's preferred rendering engine for use.
@@ -879,8 +882,9 @@ EAPI const char *elm_config_preferred_engine_get(void);
879 * @see elm_win_add() 882 * @see elm_win_add()
880 * @see elm_config_accel_preference_set() 883 * @see elm_config_accel_preference_set()
881 * @see elm_config_engine_set() 884 * @see elm_config_engine_set()
885 * @deprecated use elm_config_accel_preference_get() + elm_config_accel_preference_set()
882 */ 886 */
883EAPI void elm_config_preferred_engine_set(const char *engine); 887EINA_DEPRECATED EAPI void elm_config_preferred_engine_set(const char *engine);
884 888
885/** 889/**
886 * @brief Get Elementary's preferred engine to use. 890 * @brief Get Elementary's preferred engine to use.
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index a111e9f09..1fa38e721 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -89,7 +89,7 @@ static const Elm_Win_Trap *trap = NULL;
89 } \ 89 } \
90 } 90 }
91 91
92#define ENGINE_GET() (_elm_preferred_engine ? _elm_preferred_engine : (_elm_config->engine ? _elm_config->engine : "")) 92#define ENGINE_GET() (_elm_preferred_engine ? _elm_preferred_engine : "")
93 93
94typedef struct _Elm_Win_Data Elm_Win_Data; 94typedef struct _Elm_Win_Data Elm_Win_Data;
95 95