summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-03 12:01:35 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-03 15:29:17 +0900
commita4701ea9696d3e6aab9d5b14895cee903ea5f048 (patch)
tree60f2eeaf41ef2d36c48a0fb0ea343b3bf0e4d301
parent5fd02a79cc7e0fcc934b784a747a1aca4436bc08 (diff)
downloadefl-a4701ea9696d3e6aab9d5b14895cee903ea5f048.tar.gz
elm: Partially revert "elementary: avoid random memory access."
This reverts commit ac5a0b7e79d6b32285bd7b794f050826f38cc7c2. I added assert(pd == sd) in the modified code and couldn't find anything suspicious. The proper class is used in eo_data_scope_get(). I also can't find a crash or a bug currently in hover. I know there was a problem earlier, but that was fixed in 3092e08a83f754ba8d49c. Now, if there is still a problem, we should check it carefully. Pinging @cedric
-rw-r--r--src/lib/elementary/elm_dayselector.c3
-rw-r--r--src/lib/elementary/elm_hover.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index a65ca94c82..bc03214118 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -220,10 +220,9 @@ _item_find(const Evas_Object *obj,
}
static Eina_Bool
-_elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *pd, const char *item, Evas_Object *content)
+_elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item, Evas_Object *content)
{
Eina_Bool int_ret = EINA_FALSE;
- Elm_Dayselector_Data *sd = eo_data_scope_get(obj, MY_CLASS);
int day;
char buf[1024];
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 5d05458762..5246986c38 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -400,10 +400,9 @@ _elm_hover_subs_del(Elm_Hover_Data *sd)
}
static Eina_Bool
-_elm_hover_content_set(Eo *obj, Elm_Hover_Data *pd, const char *swallow, Evas_Object *content)
+_elm_hover_content_set(Eo *obj, Elm_Hover_Data *sd, const char *swallow, Evas_Object *content)
{
Eina_Bool int_ret;
- Elm_Hover_Data *sd = eo_data_scope_get(obj, MY_CLASS);
if (!swallow) return EINA_FALSE;