Merge branch 'master' into svn_merge

diff --git a/debian/changelog b/debian/changelog
index b1bd9eb..e0aeef0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+elementary (1.0.0+svn.58393slp2+build46) unstable; urgency=low
+
+  * [Genlist] Fixed sweep - mode bug.
+  * Git: 165.213.180.234:slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.58393slp2+build46
+
+ -- Daniel Juyung Seo <juyung.seo@samsung.com>  Thu, 14 Jul 2011 23:30:19 +0900
+
+elementary (1.0.0+svn.58393slp2+build45) unstable; urgency=low
+
+  * [store] Package Upload
+  * Git: slp-scm.sec.samsung.net:slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.58393slp2+build45
+
+ -- Ilkook Yun <ilkook.yun@samsung.com>  Thu, 14 Jul 2011 20:57:42 +0900
+
 elementary (1.0.0+svn.58393slp2+build44) unstable; urgency=low
 
   * Package Upload

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 4d698cc..4d1bd1e 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -6202,6 +6202,9 @@ _effect_item_realize(Elm_Genlist_Item *it, Eina_Bool effect_on)
    if ((it->effect_item_realized) || (it->delete_me)) return;
    char buf[1024];
 
+   if (it->mode_view)
+     _mode_finished_signal_cb(it, elm_genlist_item_object_get(it), NULL, NULL);
+
    it->edit_obj = edje_object_add(evas_object_evas_get(it->base.widget));
    edje_object_scale_set(it->edit_obj, elm_widget_scale_get(it->base.widget) *
                          _elm_config->scale);
@@ -6495,6 +6498,7 @@ elm_genlist_item_mode_set(Elm_Genlist_Item *it,
    if (!wd) return;
    if (!mode_type) return;
    if ((it->delete_me) || (it->disabled)) return;
+   if (wd->edit_mode) return;
 
    if ((wd->mode_item == it) &&
        (!strcmp(mode_type, wd->mode_type)) &&

diff --git a/src/lib/elm_store.c b/src/lib/elm_store.c
index eb12361..586cc3a 100644 (file)
--- a/src/lib/elm_store.c
+++ b/src/lib/elm_store.c
@@ -1192,6 +1192,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
                        else
                          {
                             LKU(sti->lock);
+                            printf("[%s][%d][%s] Return NULL \n",__FUNCTION__,__LINE__,part);
                             return NULL;
                          }
                     }
@@ -1489,6 +1490,8 @@ _group_item_append(Elm_Store_Item *sti, Elm_Genlist_Item_Class *itc)
 
                                            if(sort == ELM_STORE_ITEM_SORT_LOW)
                                              {
+                                                printf("[%s][%d] sti->item_info->group_index = %d  \n",__FUNCTION__,__LINE__,sti->item_info->group_index);
+                                                printf("[%s][%d] group_sti->item_info->group_index = %d  \n",__FUNCTION__,__LINE__,group_sti->item_info->group_index);
                                                 st->header_items = eina_list_prepend_relative(st->header_items, new_header_list, header_list);
                                                 sti->item = elm_genlist_item_insert_before(st->genlist,
                                                                                            itc,
@@ -1741,6 +1744,7 @@ _normal_item_append(Elm_Store_Item *sti, Elm_Genlist_Item_Class *itc)
 
                                                           if(sort == ELM_STORE_ITEM_SORT_LOW)
                                                             {
+                                                               printf("[%s][%d] comp_item->item_info->item_type = %d  \n",__FUNCTION__,__LINE__,comp_item->item_info->item_type);
                                                                sti->item_info->index = comp_item->item_info->index;
                                                                comp_item->item_info->index++;
                                                                header_list = eina_list_prepend_relative(header_list, sti, comp_item);
@@ -1840,6 +1844,7 @@ _normal_item_append(Elm_Store_Item *sti, Elm_Genlist_Item_Class *itc)
 
                                                           if(sort == ELM_STORE_ITEM_SORT_LOW)
                                                             {
+                                                               printf("[%s][%d] comp_item->item_info->item_type = %d  \n",__FUNCTION__,__LINE__,comp_item->item_info->item_type);
                                                                sti->item_info->index = comp_item->item_info->index;
                                                                comp_item->item_info->index++;
                                                                header_list = eina_list_prepend_relative(header_list, sti, comp_item);