rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=a8998f1e683a2b35cbe6a7306b6f1ae5cf169054
commit a8998f1e683a2b35cbe6a7306b6f1ae5cf169054
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Fri Dec 23 14:56:31 2016 +0200
elm_spinner: apply Tizen hack on upstream because of last changes
Change-Id: I6a3f895ad55dd5db13eb58e27d994a4d332a08a4
---
src/bin/Makefile.am | 2 +-
src/bin/common/{tizen_hacks.c => hacks.c} | 10 ++++------
src/bin/common/signals.c | 4 ----
src/bin/eflete.h | 10 ++++------
4 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index f792aef..a9d5285 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -65,7 +65,7 @@ libete_a_SOURCES = \
../../src/bin/eflete.c \
../../src/bin/common/string_common.c \
../../src/bin/common/signals.c \
-../../src/bin/common/tizen_hacks.c \
+../../src/bin/common/hacks.c \
../../src/bin/common/validator.c \
../../src/bin/common/widget_list.c \
../../src/bin/project_manager/group_manager.c \
diff --git a/src/bin/common/tizen_hacks.c b/src/bin/common/hacks.c
similarity index 83%
rename from src/bin/common/tizen_hacks.c
rename to src/bin/common/hacks.c
index 62486f1..6645601 100644
--- a/src/bin/common/tizen_hacks.c
+++ b/src/bin/common/hacks.c
@@ -18,11 +18,10 @@
*/
#include "eflete.h"
-#ifdef HAVE_TIZEN
static int _spinner_changed_from_code = 0;
static void
-_tizen_spinner_changed_hack(void *data __UNUSED__, Evas_Object *obj, void *ei)
+_spinner_changed_hack(void *data __UNUSED__, Evas_Object *obj, void *ei)
{
/* don't call callback if we are setting value to spinner from code */
if (!_spinner_changed_from_code)
@@ -30,7 +29,7 @@ _tizen_spinner_changed_hack(void *data __UNUSED__,
Evas_Object *obj, void *ei)
}
void
-tizen_hack_spinner_value_set(Evas_Object *spinner, double val)
+hack_spinner_value_set(Evas_Object *spinner, double val)
{
assert(spinner != NULL);
@@ -40,10 +39,9 @@ tizen_hack_spinner_value_set(Evas_Object *spinner, double
val)
}
Evas_Object *
-tizen_hack_spinner_add(Evas_Object *parent)
+hack_spinner_add(Evas_Object *parent)
{
Evas_Object *ret = _elm_spinner_add(parent);
- evas_object_smart_callback_add(ret, signals.elm.spinner.changed,
_tizen_spinner_changed_hack, NULL);
+ evas_object_smart_callback_add(ret, signals.elm.spinner.changed,
_spinner_changed_hack, NULL);
return ret;
}
-#endif
diff --git a/src/bin/common/signals.c b/src/bin/common/signals.c
index 4407337..f8c8599 100644
--- a/src/bin/common/signals.c
+++ b/src/bin/common/signals.c
@@ -117,11 +117,7 @@ const Signals signals = {
.elm = {
.spinner = {
.changed = "changed",
-#if HAVE_TIZEN
.changed_user = "[eflete_custom]changed,user",
-#else
- .changed_user = "changed",
-#endif
.drag_start = "spinner,drag,start",
.drag_stop = "spinner,drag,stop",
},
diff --git a/src/bin/eflete.h b/src/bin/eflete.h
index f39bbce..431a2b7 100644
--- a/src/bin/eflete.h
+++ b/src/bin/eflete.h
@@ -197,18 +197,16 @@ app_shutdown(void);
#include "alloc.h"
-#ifdef HAVE_TIZEN
/* hack functions prototypes (same as original functions) */
Evas_Object *
-tizen_hack_spinner_add(Evas_Object *parent);
+hack_spinner_add(Evas_Object *parent);
void
-tizen_hack_spinner_value_set(Evas_Object *spinner, double val);
+hack_spinner_value_set(Evas_Object *spinner, double val);
/* saving function pointers to use later in tizen_hack* functions to avoid
infonote recursion on call */
static void (* _elm_spinner_value_set)(Evas_Object *, double) __UNUSED__ =
elm_spinner_value_set;
static Evas_Object * (* _elm_spinner_add)(Evas_Object *) __UNUSED__ =
elm_spinner_add;
/* replacing functions with hack-version */
-#define elm_spinner_value_set tizen_hack_spinner_value_set
-#define elm_spinner_add tizen_hack_spinner_add
-#endif
+#define elm_spinner_value_set hack_spinner_value_set
+#define elm_spinner_add hack_spinner_add
#endif /* EFLETE_H */
--
