summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2018-06-25 11:30:20 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-06-25 11:36:52 -0400
commita1704700acac2c1df2fe3e75dfec41af99df758a (patch)
tree709fc2cc81d5224f5b45544d2642ddc7c966ed36
parent70b322b31b99544e25b8b61f4f111a62d46bf2f3 (diff)
elm_calendar: Wrap calls to edje_object_part_object_get with freeze/thaw
Summary: @ref T6884 Depends on D6416 Reviewers: zmike, ManMower Reviewed By: zmike Subscribers: cedric, #committers Tags: #efl Maniphest Tasks: T6884 Differential Revision: https://phab.enlightenment.org/D6417
-rw-r--r--src/lib/elementary/elm_calendar.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index 84ecd5a332..3570c2ce61 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -381,7 +381,7 @@ _access_calendar_item_register(Evas_Object *obj)
381static void 381static void
382_access_calendar_spinner_register(Evas_Object *obj) 382_access_calendar_spinner_register(Evas_Object *obj)
383{ 383{
384 Evas_Object *po; 384 Evas_Object *po, *o;
385 Elm_Access_Info *ai; 385 Elm_Access_Info *ai;
386 ELM_CALENDAR_DATA_GET(obj, sd); 386 ELM_CALENDAR_DATA_GET(obj, sd);
387 387
@@ -419,13 +419,14 @@ _access_calendar_spinner_register(Evas_Object *obj)
419 ai = _elm_access_info_get(sd->year_access); 419 ai = _elm_access_info_get(sd->year_access);
420 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar year")); 420 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar year"));
421 421
422 po = (Evas_Object *)edje_object_part_object_get 422 o = elm_layout_edje_get(obj);
423 (elm_layout_edje_get(obj), "month_text"); 423 edje_object_freeze(o);
424 po = (Evas_Object *)edje_object_part_object_get(o, "month_text");
424 evas_object_pass_events_set(po, EINA_FALSE); 425 evas_object_pass_events_set(po, EINA_FALSE);
425 426
426 po = (Evas_Object *)edje_object_part_object_get 427 po = (Evas_Object *)edje_object_part_object_get(o, "year_text");
427 (elm_layout_edje_get(obj), "year_text");
428 evas_object_pass_events_set(po, EINA_FALSE); 428 evas_object_pass_events_set(po, EINA_FALSE);
429 edje_object_thaw(o);
429} 430}
430 431
431static void 432static void
@@ -2040,13 +2041,15 @@ EOLIAN static void
2040_elm_calendar_item_day_number_set(Eo *obj, Elm_Calendar_Item_Data *pd, int i) 2041_elm_calendar_item_day_number_set(Eo *obj, Elm_Calendar_Item_Data *pd, int i)
2041{ 2042{
2042 char pname[14]; 2043 char pname[14];
2043 Evas_Object *po; 2044 Evas_Object *po, *o;
2044 2045
2045 pd->v = i; 2046 pd->v = i;
2046 snprintf(pname, sizeof(pname), "cit_%i.access", i); 2047 snprintf(pname, sizeof(pname), "cit_%i.access", i);
2047 2048
2048 po = (Evas_Object *)edje_object_part_object_get 2049 o = elm_layout_edje_get(efl_parent_get(obj));
2049 (elm_layout_edje_get(efl_parent_get(obj)), pname); 2050 edje_object_freeze(o);
2051 po = (Evas_Object *)edje_object_part_object_get(o, pname);
2052 edje_object_thaw(o);
2050 2053
2051 if (_elm_config->access_mode != ELM_ACCESS_MODE_ON) 2054 if (_elm_config->access_mode != ELM_ACCESS_MODE_ON)
2052 pd->part = po; 2055 pd->part = po;