From: Hyoyoung Chang Date: Fri, 1 Jul 2011 07:23:47 +0000 (+0900) Subject: Merge "[elm] add shots feature from upstream" X-Git-Tag: 1.0.0+svn.58393slp2+build40~7^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=531edbd4e49e3aa40ff13a264fcdaf4913bf94e4;hp=867e2e177595c9e2b9ddaf541b7c9ff878a73707;p=framework%2Fuifw%2Felementary.git Merge "[elm] add shots feature from upstream" --- diff --git a/debian/changelog b/debian/changelog index dbc9d02..9344a2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +elementary (1.0.0+svn.58393slp2+build37) unstable; urgency=low + + * [store] Fixed the header list free and thread cancel problem. + * Git: 165.213.180.234:slp/pkgs/e/elementary + * Tag: elementary_1.0.0+svn.58393slp2+build37 + + -- Daniel Juyung Seo Thu, 30 Jun 2011 21:34:25 +0900 + +elementary (1.0.0+svn.58393slp2+build36) unstable; urgency=low + + * [store] Fixed the header list free and thread cancel problem. + * Git: 165.213.180.234:slp/pkgs/e/elementary + * Tag: elementary_1.0.0+svn.58393slp2+build36 + + -- Daniel Juyung Seo Thu, 30 Jun 2011 21:01:10 +0900 + elementary (1.0.0+svn.58393slp2+build35) unstable; urgency=low * [store] Fixed the crash problem of store item info diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index 1546ee6..37a59b0 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -67,8 +67,6 @@ _del_pre_hook(Evas_Object *obj) #ifdef HAVE_ELEMENTARY_X if (wd->prop_hdl) ecore_event_handler_del(wd->prop_hdl); #endif - evas_object_event_callback_del_full(obj, EVAS_CALLBACK_RESIZE, _conformant_move_resize_event_cb, obj); - evas_object_event_callback_del_full(obj, EVAS_CALLBACK_MOVE, _conformant_move_resize_event_cb, obj); } static void diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index febcdd7..9e9b1c4 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -438,7 +438,7 @@ struct _Elm_Genlist_Item Evas_Object *edit_obj; int num; Ecore_Animator *item_moving_effect_timer; - Evas_Coord old_scrl_x, old_scrl_y; + Evas_Coord old_scrl_y; }; struct _Item_Cache @@ -2508,7 +2508,6 @@ _item_block_position(Item_Block *itb, } if (!it->wd->effect_mode || it->wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_NONE || ((it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE) && it->parent == it->wd->expand_item)) { - it->old_scrl_x = it->scrl_x; it->old_scrl_y = it->scrl_y; } y += it->h; diff --git a/src/lib/elm_store.c b/src/lib/elm_store.c index 17b5581..7d32f6b 100644 --- a/src/lib/elm_store.c +++ b/src/lib/elm_store.c @@ -1405,29 +1405,15 @@ _list_update(void *data, Ecore_Thread *th __UNUSED__, void *msg) static void _list_end(void *data, Ecore_Thread *th) { - EINA_SAFETY_ON_NULL_RETURN(data); - EINA_SAFETY_ON_NULL_RETURN(th); Elm_Store *st = data; - - if (th == st->list_th) - { - ecore_thread_cancel(st->list_th); - st->list_th = NULL; - } + if (th == st->list_th) st->list_th = NULL; } static void _list_cancel(void *data, Ecore_Thread *th) { - EINA_SAFETY_ON_NULL_RETURN(data); - EINA_SAFETY_ON_NULL_RETURN(th); Elm_Store *st = data; - - if (th == st->list_th) - { - ecore_thread_cancel(st->list_th); - st->list_th = NULL; - } + if (th == st->list_th) st->list_th = NULL; } static void @@ -1677,7 +1663,6 @@ _normal_item_append(Elm_Store_Item *sti, Elm_Genlist_Item_Class *itc) if (eina_list_count(header_list) == 0) { st->header_items = eina_list_remove(st->header_items, temp_header_list); - header_list = eina_list_free(header_list); } else if(eina_list_count(header_list) == 1) { @@ -1711,11 +1696,10 @@ _normal_item_append(Elm_Store_Item *sti, Elm_Genlist_Item_Class *itc) elm_genlist_item_del(temp_sti->item); free(temp_sti); st->header_items = eina_list_remove(st->header_items, temp_header_list); - header_list = eina_list_free(header_list); } } } - temp_header_list = eina_list_free(temp_header_list); + temp_header_list = NULL; removed = EINA_TRUE; } } @@ -2472,7 +2456,6 @@ elm_store_item_del(Elm_Store_Item *sti) if (eina_list_count(header_list) == 0) { st->header_items = eina_list_remove(st->header_items, temp_header_list); - header_list = eina_list_free(header_list); } else if (eina_list_count(header_list) == 1) { @@ -2505,11 +2488,10 @@ elm_store_item_del(Elm_Store_Item *sti) elm_genlist_item_del(temp_sti->item); free(temp_sti); st->header_items = eina_list_remove(st->header_items, temp_header_list); - header_list = eina_list_free(header_list); } } } - temp_header_list = eina_list_free(temp_header_list); + temp_header_list = NULL; removed = EINA_TRUE; } }