[SLP Merge] 2011/7/18 16:11

diff --cc src/lib/elm_genlist.c
index 4d1bd1e,9ded0be..e336fa5
--- 1/src/lib/elm_genlist.c
--- 2/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@@ -2141,14 -2169,13 +2169,14 @@@ _item_realize(Elm_Genlist_Item *it
     if (itc) _item_cache_free(itc);
     evas_event_thaw(evas_object_evas_get(it->wd->obj));
     evas_event_thaw_eval(evas_object_evas_get(it->wd->obj));
 -   if (!calc) evas_object_smart_callback_call(it->base.widget, "realized", it);
 +   if (!calc)
 +     evas_object_smart_callback_call(it->base.widget, "realized", it);
     if ((!calc) && (it->wd->edit_mode) && (it->flags != ELM_GENLIST_ITEM_GROUP))
       {
-         if (it->itc->edit_item_style )
+         if (it->itc->edit_item_style)
            {
-             _effect_item_realize(it, EINA_FALSE);
-             edje_object_message_signal_process(it->edit_obj);
+              if (!it->edit_obj) _effect_item_realize(it, EINA_FALSE);
+              edje_object_message_signal_process(it->edit_obj);
            }
       }
     edje_object_message_signal_process(it->base.view);

diff --cc src/lib/elm_transit.c
Simple merge