Merge upstream with r75974

[framework/uifw/elementary.git] / src / lib / elc_dayselector.c

diff --git a/src/lib/elc_dayselector.c b/src/lib/elc_dayselector.c
index 2878c3a..68f351b 100644 (file)
--- a/src/lib/elc_dayselector.c
+++ b/src/lib/elc_dayselector.c
@@ -289,7 +289,7 @@ _content_set_hook(Evas_Object *obj, const char *item, Evas_Object *content)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd || !content) return;
    if (item && !strcmp(item, "default")) return;
-   if(strcmp(elm_object_widget_type_get(content), "check")) return;
+   if (strcmp(elm_object_widget_type_get(content), "check")) return;
 
    EINA_LIST_FOREACH(wd->items, l, it)
      {
@@ -368,6 +368,7 @@ _content_unset_hook(Evas_Object *obj, const char *item)
           {
              content = VIEW(it);
              wd->items = eina_list_remove(wd->items, it);
+             elm_widget_sub_object_del(obj, VIEW(it));
              evas_object_smart_callback_del(VIEW(it), "changed", _item_clicked_cb);
              evas_object_event_callback_del(VIEW(it), EVAS_CALLBACK_DEL, _item_del_cb);
              edje_object_part_unswallow(wd->base, VIEW(it));
@@ -607,7 +608,6 @@ elm_dayselector_week_start_set(Evas_Object *obj, Elm_Dayselector_Day day)
    EINA_LIST_FOREACH(wd->items, l, it)
      {
         loc = (ELM_DAYSELECTOR_MAX - wd->week_start + it->day) % ELM_DAYSELECTOR_MAX;
-        printf("%d\n", loc);
         snprintf(buf, sizeof(buf), "day%d", loc);
         edje_object_part_swallow(wd->base, buf, VIEW(it));
      }