Merge "[*][Genlist] Applied genlist upstream patch r62823. [elementary] genlist_nasti...

diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 0e3af4e..08108a5 100644 (file)
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -332,7 +332,7 @@ _icon_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info _
              else
                wd->final_position = _FINAL_POS_BY_ORIENTATION(0);
           }
-        wd->icon_animator = ecore_animator_add(_icon_animation, wd);
+        wd->icon_animator = ecore_animator_add(_icon_animation, as);
 
         #undef _FINAL_POS_BY_ORIENTATION
      }
@@ -341,20 +341,16 @@ _icon_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info _
 static Eina_Bool
 _icon_animation(void *data)
 {
-   Evas_Object *as = data;
-   Widget_Data *wd = (Widget_Data *)data;
-   if (!wd)
-     {
-        wd->icon_animator = NULL;
-        return ECORE_CALLBACK_CANCEL;
-     }
+   Widget_Data *wd = elm_widget_data_get(data);
    double cur_position = 0.0, new_position = 0.0;
    double move_amount = 0.05;
    double adjusted_final;
    Eina_Bool flag_finish_animation = EINA_FALSE;
 
+   if (!wd) return ECORE_CALLBACK_CANCEL;
+
    edje_object_part_drag_value_get(wd->as, "elm.swallow.icon", &cur_position, NULL);
-   adjusted_final = (!elm_widget_mirrored_get(as)) ? wd->final_position : 1.0 - wd->final_position;
+   adjusted_final = (!elm_widget_mirrored_get(data)) ? wd->final_position : 1.0 - wd->final_position;
 
    if ( (adjusted_final == 0.0) ||(adjusted_final == 0.5 && cur_position >= adjusted_final) )
      {

diff --git a/src/lib/elm_datefield.c b/src/lib/elm_datefield.c
index 5f694cb..19b23d8 100644 (file)
--- a/src/lib/elm_datefield.c
+++ b/src/lib/elm_datefield.c
@@ -381,7 +381,7 @@ _datefield_focus_set(Evas_Object *data)
    if (wd->date_focusedpart == ENTRY_YEAR)
      {
         edje_object_signal_emit(wd->base, "elm,state,year,focus,in", "elm");
-        value =(char *)edje_object_part_text_get(wd->base,"elm.text.date.year");
+        value = edje_object_part_text_get(wd->base,"elm.text.date.year");
         edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
                                                    "elm.rect.date.year.over");
         count_start = wd->y_min;
@@ -394,7 +394,7 @@ _datefield_focus_set(Evas_Object *data)
    else if (wd->date_focusedpart == ENTRY_MON)
      {
         edje_object_signal_emit(wd->base, "elm,state,month,focus,in", "elm");
-        value=(char *)edje_object_part_text_get(wd->base,"elm.text.date.month");
+        value= edje_object_part_text_get(wd->base,"elm.text.date.month");
         edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
                                                    "elm.rect.date.month.over");
         count_start = 0;
@@ -403,8 +403,8 @@ _datefield_focus_set(Evas_Object *data)
    else if (wd->date_focusedpart == ENTRY_DAY)
      {
         edje_object_signal_emit(wd->base, "elm,state,day,focus,in", "elm");
-        value = (char *)edje_object_part_text_get(wd->base,"elm.text.date.day");
-        edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
+        value = edje_object_part_text_get(wd->base,"elm.text.date.day");
+        edj_part =(Evas_Object *) edje_object_part_object_get(wd->base,
                                                    "elm.rect.date.day.over");
         count_start = 1;
         count_end = _maximum_day_get(wd->year, wd->month);
@@ -412,7 +412,7 @@ _datefield_focus_set(Evas_Object *data)
    else if (wd->date_focusedpart == ENTRY_HOUR)
      {
         edje_object_signal_emit(wd->base, "elm,state,hour,focus,in", "elm");
-        value =(char *)edje_object_part_text_get(wd->base,"elm.text.time.hour");
+        value = edje_object_part_text_get(wd->base,"elm.text.time.hour");
         edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
                                                    "elm.rect.time.hour.over");
         if (wd->time_mode)
@@ -429,7 +429,7 @@ _datefield_focus_set(Evas_Object *data)
    else if (wd->date_focusedpart == ENTRY_MIN)
      {
         edje_object_signal_emit(wd->base, "elm,state,min,focus,in", "elm");
-        value = (char *)edje_object_part_text_get(wd->base,"elm.text.time.min");
+        value = edje_object_part_text_get(wd->base,"elm.text.time.min");
         edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
                                                    "elm.rect.time.min.over");
         count_start = 0;
@@ -444,7 +444,7 @@ _datefield_focus_set(Evas_Object *data)
         else
           snprintf(str, sizeof(str), "%02d", idx);
         item_list[idx] = eina_stringshare_add(str);
-        if (strcmp(value, item_list[idx]) == 0)
+        if ((value) && (strcmp(value, item_list[idx]) == 0))
           item = elm_diskselector_item_append(diskselector,item_list[idx],NULL,
                                               _diskselector_cb, data);
         else
@@ -681,10 +681,6 @@ elm_datefield_add(Evas_Object *parent)
 
    ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
 
-   e = evas_object_evas_get(parent);
-   if (!e) return NULL;
-   wd = ELM_NEW(Widget_Data);
-   obj = elm_widget_add(e);
    ELM_SET_WIDTYPE(widtype, "datefield");
    elm_widget_type_set(obj, "datefield");
    elm_widget_sub_object_add(parent, obj);
@@ -1032,12 +1028,13 @@ elm_datefield_time_mode_set(Evas_Object *obj, Eina_Bool mode)
 
    if (wd->time_mode != mode)
      {
-   wd->time_mode = mode;
-   if (!wd->time_mode) edje_object_signal_emit(wd->base, "elm,state,mode,24h",
-                                               "elm");
-   else edje_object_signal_emit(wd->base, "elm,state,mode,12h", "elm");
-   edje_object_message_signal_process(wd->base);
-   _date_update(obj);
+        wd->time_mode = mode;
+        if (!wd->time_mode)
+          edje_object_signal_emit(wd->base, "elm,state,mode,24h","elm");
+        else
+          edje_object_signal_emit(wd->base, "elm,state,mode,12h", "elm");
+        edje_object_message_signal_process(wd->base);
+        _date_update(obj);
      }
 }