cnp error!

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

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index abeaef6..e1d724d 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -957,7 +957,7 @@ _item_realize(Elm_Gengrid_Item *it)
    edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(WIDGET(it)));
    evas_object_smart_member_add(VIEW(it), it->wd->pan_smart);
    elm_widget_sub_object_add(it->wd->self, VIEW(it));
-   snprintf(style, sizeof(style), "it/%s",
+   snprintf(style, sizeof(style), "item/%s",
             it->itc->item_style ? it->itc->item_style : "default");
    _elm_theme_object_set(it->wd->self, VIEW(it), "gengrid", style,
                          elm_widget_style_get(it->wd->self));
@@ -1090,6 +1090,7 @@ _item_unrealize(Elm_Gengrid_Item *it)
    Evas_Object *icon;
 
    if (!it->realized) return;
+   evas_object_smart_callback_call(WIDGET(it), SIG_UNREALIZED, it);
    if (it->long_timer)
      {
         ecore_timer_del(it->long_timer);
@@ -1203,11 +1204,7 @@ _group_item_place(Pan *sd)
              evas_object_raise(VIEW(it));
           }
         else
-          {
-             _item_unrealize(it);
-             if (was_realized)
-               evas_object_smart_callback_call(it->wd->self, SIG_UNREALIZED, it);
-          }
+          _item_unrealize(it);
      }
 }
 
@@ -1470,11 +1467,7 @@ _item_place(Elm_Gengrid_Item *it,
    else
      {
         if (!it->is_group)
-          {
-             _item_unrealize(it);
-             if (was_realized)
-               evas_object_smart_callback_call(it->wd->self, SIG_UNREALIZED, it);
-          }
+          _item_unrealize(it);
         else
           it->group_realized = EINA_FALSE;
      }
@@ -1488,7 +1481,7 @@ _item_label_hook(Elm_Gengrid_Item *it, const char *part)
 }
 
 static Elm_Gengrid_Item *
-_item_create(Widget_Data                  *wd,
+_item_new(Widget_Data                  *wd,
              const Elm_Gengrid_Item_Class *itc,
              const void                   *data,
              Evas_Smart_Cb                 func,
@@ -2160,7 +2153,7 @@ elm_gengrid_item_append(Evas_Object                  *obj,
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
 
-   it = _item_create(wd, itc, data, func, func_data);
+   it = _item_new(wd, itc, data, func, func_data);
    if (!it) return NULL;
    wd->items = eina_inlist_append(wd->items, EINA_INLIST_GET(it));
 
@@ -2185,7 +2178,7 @@ elm_gengrid_item_prepend(Evas_Object                  *obj,
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
 
-   it = _item_create(wd, itc, data, func, func_data);
+   it = _item_new(wd, itc, data, func, func_data);
    if (!it) return NULL;
    wd->items = eina_inlist_prepend(wd->items, EINA_INLIST_GET(it));
    if (it->is_group)
@@ -2211,7 +2204,7 @@ elm_gengrid_item_insert_before(Evas_Object                  *obj,
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
 
-   it = _item_create(wd, itc, data, func, func_data);
+   it = _item_new(wd, itc, data, func, func_data);
    if (!it) return NULL;
    wd->items = eina_inlist_prepend_relative
       (wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(relative));
@@ -2238,7 +2231,7 @@ elm_gengrid_item_insert_after(Evas_Object                  *obj,
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
 
-   it = _item_create(wd, itc, data, func, func_data);
+   it = _item_new(wd, itc, data, func, func_data);
    if (!it) return NULL;
    wd->items = eina_inlist_append_relative
       (wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(relative));
@@ -2264,7 +2257,7 @@ elm_gengrid_item_direct_sorted_insert(Evas_Object                  *obj,
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
 
-   it = _item_create(wd, itc, data, func, func_data);
+   it = _item_new(wd, itc, data, func, func_data);
    if (!it) return NULL;
 
    if (!wd->state)