[TIZENIOT-2073] Fixed force close issue when all files are moved from one album to...

Change-Id: Ifd09f2a9ecbf0615903d15d90175a16dcc4d6998
Signed-off-by: mohitkr1 <mohit.kr1@samsung.com>

diff --git a/src/2dview/gl-albums-edit.c b/src/2dview/gl-albums-edit.c
index 7ec995bfae583c47a4ffdbf0afc71052a75fc3e7..6c0ddfe234ef4144b6f61dec0f756f5de50f2c24 100755 (executable)
--- a/src/2dview/gl-albums-edit.c
+++ b/src/2dview/gl-albums-edit.c
@@ -341,8 +341,6 @@ int _gl_albums_edit_add_btns(void *data, Evas_Object * parent)
        elm_object_style_set(btn1, "textbutton");
        evas_object_size_hint_min_set(btn1, ELM_SCALE_SIZE(148), ELM_SCALE_SIZE(48));
        elm_object_text_set(btn1, "<font_size=18>CANCEL</font_size>");
-       elm_object_item_part_content_set(ad->ctrlinfo.nf_it,
-                                                                        GL_NAVIFRAME_TITLE_LEFT_BTN, btn1);
        evas_object_smart_callback_add(btn1, "clicked", __gl_albums_edit_cancel_cb, ad);
        evas_object_show(btn1);
        elm_box_pack_end(box, btn1);
@@ -351,8 +349,6 @@ int _gl_albums_edit_add_btns(void *data, Evas_Object * parent)
        elm_object_style_set(btn2, "textbutton");
        evas_object_size_hint_min_set(btn2, ELM_SCALE_SIZE(126), ELM_SCALE_SIZE(48));
        elm_object_text_set(btn2, "<font_size=18>DONE</font_size>");
-       elm_object_item_part_content_set(ad->ctrlinfo.nf_it,
-                                                                        GL_NAVIFRAME_TITLE_RIGHT_BTN, btn2);
        evas_object_smart_callback_add(btn2, "clicked", __gl_albums_edit_del_cb, ad);
        ad->ctrlinfo.timeline_done=btn2;
        elm_object_disabled_set(btn2, EINA_TRUE);

diff --git a/src/2dview/gl-thumbs-edit.c b/src/2dview/gl-thumbs-edit.c
index f194de1f08bb753242c3e6d30708c10fa340759e..3b605692056944e8c7e354d898caea61f914171e 100755 (executable)
--- a/src/2dview/gl-thumbs-edit.c
+++ b/src/2dview/gl-thumbs-edit.c
@@ -261,8 +261,6 @@ int _gl_thumbs_edit_add_btns(void *data, Evas_Object * parent,
        elm_object_style_set(btn1, "textbutton");
        evas_object_size_hint_min_set(btn1, ELM_SCALE_SIZE(148), ELM_SCALE_SIZE(48));
        elm_object_text_set(btn1, "<font_size=18>CANCEL</font_size>");
-       elm_object_item_part_content_set(nf_it,
-                                                                        GL_NAVIFRAME_TITLE_LEFT_BTN, btn1);
        evas_object_smart_callback_add(btn1, "clicked", __gl_thumbs_edit_cancel_cb, ad);
        evas_object_show(btn1);
        elm_box_pack_end(box, btn1);
@@ -271,8 +269,6 @@ int _gl_thumbs_edit_add_btns(void *data, Evas_Object * parent,
        elm_object_style_set(btn2, "textbutton");
        evas_object_size_hint_min_set(btn2, ELM_SCALE_SIZE(126), ELM_SCALE_SIZE(48));
        elm_object_text_set(btn2, "<font_size=18>DONE</font_size>");
-       elm_object_item_part_content_set(nf_it,
-                                                                        GL_NAVIFRAME_TITLE_RIGHT_BTN, btn2);
        evas_object_smart_callback_add(btn2, "clicked", __gl_thumbs_edit_done_cb, ad);
        ad->ctrlinfo.timeline_done=btn2;
        elm_object_disabled_set(btn2, EINA_TRUE);

diff --git a/src/2dview/gl-thumbs-sel.c b/src/2dview/gl-thumbs-sel.c
index e9eff58a772108110bba290888b74dcbc9c63599..f0a3b5221e153ed4ad4785fc140d18b8d5eae0a4 100755 (executable)
--- a/src/2dview/gl-thumbs-sel.c
+++ b/src/2dview/gl-thumbs-sel.c
@@ -390,8 +390,6 @@ int _gl_thumbs_sel_create_view(void *data, gl_cluster * album_item)
        elm_object_style_set(btn1, "textbutton");
        evas_object_size_hint_min_set(btn1, ELM_SCALE_SIZE(148), ELM_SCALE_SIZE(48));
        elm_object_text_set(btn1, "<font_size=18>CANCEL</font_size>");
-       elm_object_item_part_content_set(ad->albuminfo.nf_it_select,
-                                                                        GL_NAVIFRAME_TITLE_LEFT_BTN, btn1);
        evas_object_smart_callback_add(btn1, "clicked", __gl_thumbs_sel_cancel_cb, ad);
        evas_object_show(btn1);
        elm_box_pack_end(box, btn1);
@@ -400,8 +398,6 @@ int _gl_thumbs_sel_create_view(void *data, gl_cluster * album_item)
        elm_object_style_set(btn2, "textbutton");
        evas_object_size_hint_min_set(btn2, ELM_SCALE_SIZE(126), ELM_SCALE_SIZE(48));
        elm_object_text_set(btn2, "<font_size=18>DONE</font_size>");
-       elm_object_item_part_content_set(ad->albuminfo.nf_it_select,
-                                                                        GL_NAVIFRAME_TITLE_RIGHT_BTN, btn2);
        evas_object_smart_callback_add(btn2, "clicked", __gl_thumbs_sel_done_cb, ad);
        ad->ctrlinfo.timeline_done=btn2;
        elm_object_disabled_set(btn2, EINA_TRUE);

diff --git a/src/2dview/gl-timeline.c b/src/2dview/gl-timeline.c
index 459382ec20d36a631229043df99ea6c2aa5e9b96..2db3edeadc24974dd91766d2f229e450551bcf79 100755 (executable)
--- a/src/2dview/gl-timeline.c
+++ b/src/2dview/gl-timeline.c
@@ -2662,8 +2662,6 @@ static int __gl_timeline_edit_add_btns(void *data)
        elm_object_style_set(btn1, "textbutton");
        evas_object_size_hint_min_set(btn1, ELM_SCALE_SIZE(148), ELM_SCALE_SIZE(48));
        elm_object_text_set(btn1, "<font_size=18>CANCEL</font_size>");
-       elm_object_item_part_content_set(ad->ctrlinfo.nf_it,
-                                                                        GL_NAVIFRAME_TITLE_LEFT_BTN, btn1);
        evas_object_smart_callback_add(btn1, "clicked", __gl_timeline_edit_cancel_cb, ad);
        evas_object_show(btn1);
        elm_box_pack_end(box, btn1);
@@ -2672,8 +2670,6 @@ static int __gl_timeline_edit_add_btns(void *data)
        elm_object_style_set(btn2, "textbutton");
        evas_object_size_hint_min_set(btn2, ELM_SCALE_SIZE(126), ELM_SCALE_SIZE(48));
        elm_object_text_set(btn2, "<font_size=18>DONE</font_size>");
-       elm_object_item_part_content_set(ad->ctrlinfo.nf_it,
-                                                                        GL_NAVIFRAME_TITLE_RIGHT_BTN, btn2);
        evas_object_smart_callback_add(btn2, "clicked", __gl_timeline_del_cb, ad);
        elm_object_disabled_set(btn2, EINA_TRUE);
        ad->ctrlinfo.timeline_done=btn2;