Removed redundant variable and code alignment fixes

Change-Id: I9ec84a318d06c84e6208d0aa8114d76a14b60059
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>

diff --git a/src/common/mp-common.c b/src/common/mp-common.c
index 39f50d1..72953a8 100644 (file)
--- a/src/common/mp-common.c
+++ b/src/common/mp-common.c
@@ -381,8 +381,6 @@ _ctx_popup_del_cb(void *data, Evas * e, Evas_Object * eo, void *event_info)
        MP_CHECK(ad);
        MP_CHECK(ad->win_main);
 
-       ad->del_cb_invoked = 1;
-
        Evas_Object *navi = GET_NAVIFRAME;
        if (navi) {
                evas_object_event_callback_del(navi, EVAS_CALLBACK_RESIZE,

diff --git a/src/common/mp-edit-callback.c b/src/common/mp-edit-callback.c
index 4e80c05..8842831 100644 (file)
--- a/src/common/mp-edit-callback.c
+++ b/src/common/mp-edit-callback.c
@@ -2070,7 +2070,6 @@ _mp_edit_delete_popup_response_cb(void *data, Evas_Object * obj,
        MP_CHECK(ad);
 
        ad->popup_delete = NULL;
-       ad->del_cb_invoked = 0;
        mp_evas_object_del(obj);
 
        int response = (int) event_info;

diff --git a/src/include/music.h b/src/include/music.h
index a4188f0..6f13bb6 100644 (file)
--- a/src/include/music.h
+++ b/src/include/music.h
@@ -238,8 +238,6 @@ struct appdata {
        Evas_Object *bg;
        Evas_Object *popup[MP_POPUP_MAX];
        int win_angle;
-       int del_cb_invoked;
-       int device_state_id;
 
        /* App control parameters */
        bool exit_status;

diff --git a/src/view/mp-add-track-view.c b/src/view/mp-add-track-view.c
index 23960cd..7eda3c7 100644 (file)
--- a/src/view/mp-add-track-view.c
+++ b/src/view/mp-add-track-view.c
@@ -78,7 +78,6 @@ Eina_Bool _mp_add_track_view_tracklist_back_cb(void *data,
        struct appdata *ad = mp_util_get_appdata();
        MP_CHECK_VAL(ad, EINA_TRUE);
 
-       ad->del_cb_invoked = 0;
        MpViewMgr_t *view_mgr = mp_view_mgr_get_view_manager();
        mp_view_mgr_pop_view(view_mgr, false);
 

diff --git a/src/view/mp-all-view.c b/src/view/mp-all-view.c
index cf13c8d..6c0cfbf 100644 (file)
--- a/src/view/mp-all-view.c
+++ b/src/view/mp-all-view.c
@@ -336,8 +336,6 @@ static void _all_view_tab_change_cb(void *data, Evas_Object * obj,
 
        view->history = _mp_all_view_tab_index_get(view);
 
-       ad->del_cb_invoked = 0;
-
        switch (index) {
        case MP_TAB_PLAYLISTS:
                list = (void *) mp_playlist_list_create(view->all_view_layout);

diff --git a/src/view/mp-edit-view.c b/src/view/mp-edit-view.c
index 000b17d..ddb7c70 100644 (file)
--- a/src/view/mp-edit-view.c
+++ b/src/view/mp-edit-view.c
@@ -85,20 +85,6 @@ static Eina_Bool _mp_edit_view_back_cb(void *data, Elm_Object_Item * it)
 
        struct appdata *ad = mp_util_get_appdata();
        MP_CHECK_FALSE(ad);
-       ad->del_cb_invoked = 0;
-
-       /*
-          if (view->content_to_show->reorderable) {
-          DEBUG_TRACE("view->ref_list->reorderable = %d",view->ref_list->reorderable);
-          int ret = 0;
-          void *playlist_handle = mp_list_get_playlist_handle(view->content_to_show);
-          DEBUG_TRACE("playlist_handle = %p", playlist_handle);
-          ret = mp_media_info_playlist_update_db(playlist_handle);
-          MP_CHECK_VAL(ret == 0, -1);
-          mp_view_mgr_post_event(GET_VIEW_MGR, MP_PLAYLIST_REORDER_DONE);
-          mp_list_set_reorder((MpList_t *)view->content_to_show, FALSE);
-          }
-        */
 
        MpViewMgr_t *view_mgr = mp_view_mgr_get_view_manager();
        mp_view_mgr_pop_view(view_mgr, false);

diff --git a/src/view/mp-player-view.c b/src/view/mp-player-view.c
index a578b06..1afe200 100644 (file)
--- a/src/view/mp-player-view.c
+++ b/src/view/mp-player-view.c
@@ -1129,7 +1129,6 @@ static Eina_Bool _mp_player_view_back_button_clicked_cb(void *data,
        MP_CHECK_FALSE(ad);
 
        ad->hide_player_view = true;
-       ad->del_cb_invoked = 0;
 
        mp_evas_object_del(view->volume_popup);
        CHECK_VIEW(view);

diff --git a/src/view/mp-search-view.c b/src/view/mp-search-view.c
index 0b54615..cf38e51 100644 (file)
--- a/src/view/mp-search-view.c
+++ b/src/view/mp-search-view.c
@@ -68,7 +68,6 @@ static Eina_Bool _mp_search_view_back_cb(void *data, Elm_Object_Item * it)
        struct appdata *ad = mp_util_get_appdata();
        MP_CHECK_VAL(ad, EINA_TRUE);
 
-       ad->del_cb_invoked = 0;
        MpSearchView_t *view = (MpSearchView_t *) data;
        MP_CHECK_VAL(view, EINA_TRUE);
 

diff --git a/src/widget/mp-album-list.c b/src/widget/mp-album-list.c
index 8dcc269..e0068eb 100644 (file)
--- a/src/widget/mp-album-list.c
+++ b/src/widget/mp-album-list.c
@@ -562,7 +562,7 @@ static void _mp_album_list_update(void *thiz)
 
                evas_object_data_set(list->genlist, "list_handle", list);
 
-               if (ad->del_cb_invoked == 0) {
+               if (!list->edit_mode) {
                        mp_list_bottom_counter_item_append((MpList_t *) list);
                }
 

diff --git a/src/widget/mp-artist-list.c b/src/widget/mp-artist-list.c
index 390b244..bfc5722 100644 (file)
--- a/src/widget/mp-artist-list.c
+++ b/src/widget/mp-artist-list.c
@@ -674,7 +674,7 @@ void _mp_artist_list_update(void *thiz)
 
                evas_object_data_set(list->genlist, "list_handle", list);
 
-               if (ad->del_cb_invoked == 0) {
+               if (!list->edit_mode) {
                        mp_list_bottom_counter_item_append((MpList_t *) list);
                }
 

diff --git a/src/widget/mp-edit-playlist.c b/src/widget/mp-edit-playlist.c
index a14afb2..888f608 100644 (file)
--- a/src/widget/mp-edit-playlist.c
+++ b/src/widget/mp-edit-playlist.c
@@ -34,7 +34,7 @@ typedef struct _Item_Data {
 
 static void
 mp_edit_playlist_rename_done_cb(void *data, Evas_Object * obj,
-                                                               void *event_info);
+               void *event_info);
 
 static void _mp_edit_playlist_destory(void *thiz)
 {
@@ -44,7 +44,6 @@ static void _mp_edit_playlist_destory(void *thiz)
 
        struct appdata *ad = mp_util_get_appdata();
        MP_CHECK(ad);
-       ad->del_cb_invoked = 0;
        // TODO: release resource..
        IF_FREE(mp_playlist_data->adding_media_id);
 
@@ -65,19 +64,14 @@ _mp_edit_playlist_create_new_done_cb(void *data, Evas_Object * obj,
        IF_FREE(mp_playlist_data->oldname);
 
        int plst_uid = -1;
-
        char *converted_name = NULL;
-       //Evas_Object *entry = mp_widget_editfield_entry_get(view->editfiled_new_playlist);
-       //const char *name = elm_entry_entry_get(entry);
-
        const char *name =
                elm_entry_entry_get(mp_playlist_data->editfiled_entry);
 
        if (name == NULL || strlen(name) == 0) {
-               //name = elm_object_part_text_get(view->editfiled_new_playlist, "elm.guidetext");
                name =
-                       elm_object_part_text_get(mp_playlist_data->editfiled_entry,
-                                                                        "elm.guide");
+                               elm_object_part_text_get(mp_playlist_data->editfiled_entry,
+                                               "elm.guide");
        }
        converted_name = elm_entry_markup_to_utf8(name);
 
@@ -99,9 +93,9 @@ _mp_edit_playlist_create_new_done_cb(void *data, Evas_Object * obj,
        if (mp_playlist_data->adding_list) {
                WARN_TRACE("adding list = %p", mp_playlist_data->adding_list);
                mp_edit_cb_excute_add_to_playlist(mp_playlist_data->adding_list,
-                                                                                 plst_uid, converted_name,
-                                                                                 mp_playlist_data->
-                                                                                 add_to_selected);
+                               plst_uid, converted_name,
+                               mp_playlist_data->
+                               add_to_selected);
                goto END;
        }
 
@@ -115,17 +109,16 @@ _mp_edit_playlist_create_new_done_cb(void *data, Evas_Object * obj,
                        (playlist, mp_playlist_data->adding_media_id, path) == 0) {
                        mp_media_info_playlist_db_update(playlist);
                }
-
                mp_media_info_destroy(media_info);
-
        }
+
        //create playlist view
        MpViewMgr_t *view_mgr = mp_view_mgr_get_view_manager();
 
        MpPlaylistDetailView_t *view_plst_detail =
-               mp_playlist_detail_view_create(view_mgr->navi,
-                                                                          MP_TRACK_BY_PLAYLIST,
-                                                                          converted_name, plst_uid);
+                       mp_playlist_detail_view_create(view_mgr->navi,
+                                       MP_TRACK_BY_PLAYLIST,
+                                       converted_name, plst_uid);
        mp_view_mgr_push_view(view_mgr, (MpView_t *) view_plst_detail, NULL);
 
        /*post event to update all-view in playlist detail view transition finished
@@ -173,17 +166,17 @@ _mp_edit_playlist_entry_eraser_status_set(void *obj, void *data)
        if (elm_object_focus_get(editfield)) {
                if (elm_entry_is_empty(editfield)) {
                        elm_object_signal_emit(editfield, "elm,state,eraser,hide",
-                                                                  "elm");
+                                       "elm");
                        if (mp_playlist_data->btn_ok) {
                                elm_object_disabled_set(mp_playlist_data->btn_ok,
-                                                                               EINA_TRUE);
+                                               EINA_TRUE);
                        }
                } else {
                        elm_object_signal_emit(editfield, "elm,state,eraser,show",
-                                                                  "elm");
+                                       "elm");
                        if (mp_playlist_data->btn_ok) {
                                elm_object_disabled_set(mp_playlist_data->btn_ok,
-                                                                               EINA_FALSE);
+                                               EINA_FALSE);
                        }
                }
        }
@@ -228,7 +221,7 @@ static bool __mp_rename_ctrl_check_valid_text(const char *text, int *nLen)
 
 static void
 _mp_edit_playlist_entry_changed_cb(void *data, Evas_Object * obj,
-                                                                  void *event_info)
+               void *event_info)
 {
        eventfunc;
        struct appdata *ad = mp_util_get_appdata();
@@ -244,16 +237,16 @@ _mp_edit_playlist_entry_changed_cb(void *data, Evas_Object * obj,
                int length = strlen(text);
                if (length > 0) {
                        elm_object_signal_emit(mp_playlist_data->layout,
-                                                                  "image,enable,1", "*");
+                                       "image,enable,1", "*");
                } else {
                        elm_object_signal_emit(mp_playlist_data->layout,
-                                                                  "image,disable,1", "*");
+                                       "image,disable,1", "*");
                }
        }
        _mp_edit_playlist_entry_eraser_status_set(editfield, data);
 
        char *name =
-               (char *) elm_entry_entry_get(mp_playlist_data->editfiled_entry);
+                       (char *) elm_entry_entry_get(mp_playlist_data->editfiled_entry);
        char *szFileName = elm_entry_markup_to_utf8(name);
        if (!szFileName) {
                return;
@@ -279,16 +272,16 @@ _mp_edit_playlist_entry_changed_cb(void *data, Evas_Object * obj,
                        return;
                } else {
                        int position =
-                               elm_entry_cursor_pos_get(mp_playlist_data->
-                                                                                editfiled_entry);
-                       ERROR_TRACE("THE cursor position is %d", position);
+                                       elm_entry_cursor_pos_get(mp_playlist_data->
+                                                       editfiled_entry);
+                       ERROR_TRACE("The cursor position is %d", position);
                        elm_entry_cursor_begin_set(mp_playlist_data->editfiled_entry);
                        elm_entry_entry_set(mp_playlist_data->editfiled_entry,
-                                                               elm_entry_utf8_to_markup(mp_playlist_data->
-                                                                                                                oldname));
+                                       elm_entry_utf8_to_markup(mp_playlist_data->
+                                                       oldname));
                        elm_entry_cursor_begin_set(mp_playlist_data->editfiled_entry);
                        elm_entry_cursor_pos_set(mp_playlist_data->editfiled_entry,
-                                                                        position - 1);
+                                       position - 1);
                        mp_util_post_status_message(ad, popup_txt);
                        IF_FREE(text);
                        IF_FREE(szFileName);
@@ -309,7 +302,7 @@ _mp_edit_playlist_entry_changed_cb(void *data, Evas_Object * obj,
                if (mp_playlist_data->editfiled_entry != NULL) {
                        IF_FREE(mp_playlist_data->new_playlist_name);
                        mp_playlist_data->new_playlist_name =
-                               elm_entry_markup_to_utf8(name);
+                                       elm_entry_markup_to_utf8(name);
                }
        }
 
@@ -320,7 +313,7 @@ _mp_edit_playlist_entry_changed_cb(void *data, Evas_Object * obj,
        if (mp_playlist_data->set_to_end) {
                mp_ecore_idler_del(mp_playlist_data->set_line_end_idler);
                mp_playlist_data->set_line_end_idler =
-                       ecore_idler_add(_mp_edit_playlist_entry_set_line_end, data);
+                               ecore_idler_add(_mp_edit_playlist_entry_set_line_end, data);
        }
        IF_FREE(szFileName);
        IF_FREE(text);
@@ -331,9 +324,9 @@ static char *_mp_edit_playlist_get_new_playlist_name(void)
        char unique_name[MP_PLAYLIST_NAME_SIZE] = "\0";
        int ret = 0;
        ret =
-               mp_media_info_playlist_unique_name(GET_STR(STR_MP_MY_PLAYLIST),
-                                                                                  unique_name,
-                                                                                  MP_PLAYLIST_NAME_SIZE);
+                       mp_media_info_playlist_unique_name(GET_STR(STR_MP_MY_PLAYLIST),
+                                       unique_name,
+                                       MP_PLAYLIST_NAME_SIZE);
        if (ret == 0) {
                if (strlen(unique_name) <= 0) {
                        ERROR_TRACE("playlist name is NULL");
@@ -343,8 +336,8 @@ static char *_mp_edit_playlist_get_new_playlist_name(void)
                }
        } else {
                ERROR_TRACE
-                       ("fail to mp_media_info_playlist_unique_name() : error code [%x] ",
-                        ret);
+               ("fail to mp_media_info_playlist_unique_name() : error code [%x] ",
+                               ret);
                return NULL;
        }
 
@@ -365,9 +358,6 @@ static void _mp_edit_playlist_entry_focused_cb(void *data, Evas_Object * obj, vo
 
        if (mp_playlist_data->type == MP_PLST_RENAME) {
                elm_object_signal_emit(editfield, "elm,state,eraser,hide", "elm");
-//                char *text = elm_entry_utf8_to_markup(mp_playlist_data->name);
-//                elm_entry_entry_set(mp_playlist_data->editfiled_entry,  text);
-//                IF_FREE(text);
                elm_entry_cursor_end_set(mp_playlist_data->editfiled_entry);
        }
 }
@@ -380,7 +370,6 @@ static void _mp_edit_playlist_entry_unfocused_cb(void *data, Evas_Object * obj,
        MP_CHECK(editfield);
 
        elm_object_signal_emit(editfield, "elm,state,eraser,hide", "elm");
-       //elm_object_item_signal_emit(id->item, "elm,state,rename,show", "");
 }
 
 static void
@@ -393,8 +382,8 @@ _mp_create_plst_entry_maxlength_reached_cb(void *data, Evas_Object * obj,
 
 static void
 _mp_search_edit_cancel_button_clicked(void *data, Evas_Object * o,
-                                                                         const char *emission,
-                                                                         const char *source)
+               const char *emission,
+               const char *source)
 {
        Evas_Object *en = (Evas_Object *) data;
        elm_object_text_set(en, "");
@@ -417,50 +406,47 @@ Evas_Object *_mp_edit_playlist_create_editfield(void *thiz)
        MP_CHECK_NULL(entry);
        elm_entry_scrollable_set(entry, EINA_TRUE);
        elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,
-                                                       ELM_SCROLLER_POLICY_AUTO);
+                       ELM_SCROLLER_POLICY_AUTO);
        elm_entry_single_line_set(entry, EINA_TRUE);
 
        elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
        elm_entry_input_panel_layout_set(entry, ELM_INPUT_PANEL_LAYOUT_NORMAL);
        elm_entry_editable_set(entry, TRUE);
        elm_entry_input_panel_return_key_type_set(entry,
-                                                                                         ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
+                       ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
        elm_entry_input_panel_return_key_disabled_set(entry, EINA_FALSE);
-       //elm_entry_prediction_allow_set(entry, EINA_FALSE);
 
        evas_object_smart_callback_add(entry, "changed",
-                                                                  _mp_edit_playlist_entry_changed_cb,
-                                                                  mp_playlist_data);
+                       _mp_edit_playlist_entry_changed_cb,
+                       mp_playlist_data);
        evas_object_smart_callback_add(entry, "preedit,changed",
-                                                                  _mp_edit_playlist_entry_changed_cb,
-                                                                  mp_playlist_data);
+                       _mp_edit_playlist_entry_changed_cb,
+                       mp_playlist_data);
        evas_object_smart_callback_add(entry, "focused",
-                                                                  _mp_edit_playlist_entry_focused_cb,
-                                                                  mp_playlist_data);
+                       _mp_edit_playlist_entry_focused_cb,
+                       mp_playlist_data);
        evas_object_smart_callback_add(entry, "unfocused",
-                                                                  _mp_edit_playlist_entry_unfocused_cb,
-                                                                  mp_playlist_data);
+                       _mp_edit_playlist_entry_unfocused_cb,
+                       mp_playlist_data);
 
        static Elm_Entry_Filter_Limit_Size limit_filter_data;
        limit_filter_data.max_char_count = MP_PLAYLIST_NAME_SIZE;
        limit_filter_data.max_byte_count = 0;
        elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size,
-                                                                  &limit_filter_data);
+                       &limit_filter_data);
        evas_object_smart_callback_add(entry, "maxlength,reached",
-                                                                  _mp_create_plst_entry_maxlength_reached_cb,
-                                                                  mp_playlist_data);
+                       _mp_create_plst_entry_maxlength_reached_cb,
+                       mp_playlist_data);
        edje_object_signal_callback_add(_EDJ(mp_playlist_data->layout),
-                                                                       "elm,action,click", "cancel_image",
-                                                                       _mp_search_edit_cancel_button_clicked,
-                                                                       entry);
-       //elm_entry_cursor_end_set (entry);
+                       "elm,action,click", "cancel_image",
+                       _mp_search_edit_cancel_button_clicked,
+                       entry);
        evas_object_show(entry);
 
        if (mp_playlist_data->new_playlist_name
-               && (mp_playlist_data->type != MP_PLST_RENAME)) {
-               //elm_object_part_text_set(entry, "elm.guide", mp_playlist_data->new_playlist_name);
+                       && (mp_playlist_data->type != MP_PLST_RENAME)) {
                char *text =
-                       elm_entry_utf8_to_markup(mp_playlist_data->new_playlist_name);
+                               elm_entry_utf8_to_markup(mp_playlist_data->new_playlist_name);
                elm_entry_entry_set(entry, text);
                IF_FREE(text);
                elm_entry_cursor_end_set(entry);
@@ -468,11 +454,11 @@ Evas_Object *_mp_edit_playlist_create_editfield(void *thiz)
 
        if (mp_playlist_data->type == MP_PLST_RENAME) {
                evas_object_smart_callback_add(entry, "activated",
-                                                                          mp_edit_playlist_rename_done_cb,
-                                                                          mp_playlist_data);
+                               mp_edit_playlist_rename_done_cb,
+                               mp_playlist_data);
                char *name = NULL;
                mp_media_info_group_get_main_info(mp_playlist_data->
-                                                                                 playlist_handle, &name);
+                               playlist_handle, &name);
 
                IF_FREE(mp_playlist_data->name);
                mp_playlist_data->name = g_strdup(name);
@@ -484,13 +470,13 @@ Evas_Object *_mp_edit_playlist_create_editfield(void *thiz)
                }
        } else {
                evas_object_smart_callback_add(entry, "activated",
-                                                                          _mp_edit_playlist_create_new_done_cb,
-                                                                          mp_playlist_data);
+                               _mp_edit_playlist_create_new_done_cb,
+                               mp_playlist_data);
        }
 
        elm_object_signal_callback_add(entry, "elm,eraser,clicked", "elm",
-                                                                  _mp_edit_playlist_entry_eraser_clicked_cb,
-                                                                  entry);
+                       _mp_edit_playlist_entry_eraser_clicked_cb,
+                       entry);
 
        return entry;
 }
@@ -502,8 +488,6 @@ static void _mp_edit_playlist_cancel_cb(void *data, Evas_Object * obj,
        struct appdata *ad = mp_util_get_appdata();
        MP_CHECK(ad);
 
-       ad->del_cb_invoked = 0;
-
        mp_view_mgr_post_event(GET_VIEW_MGR, MP_POPUP_CANCEL);
 
        Mp_Playlist_Data *mp_playlist_data = (Mp_Playlist_Data *) data;
@@ -556,28 +540,28 @@ void mp_edit_playlist_content_create(void *thiz)
        elm_layout_file_set(layout, edje_path, "popup_entryview");
        free(path);
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
-                                                                        EVAS_HINT_EXPAND);
+                       EVAS_HINT_EXPAND);
        elm_object_focus_set(layout, EINA_FALSE);
 
        mp_playlist_data->layout = layout;
 
        mp_playlist_data->new_playlist_name =
-               _mp_edit_playlist_get_new_playlist_name();
+                       _mp_edit_playlist_get_new_playlist_name();
        mp_playlist_data->editfiled_entry =
-               _mp_edit_playlist_create_editfield(mp_playlist_data);
+                       _mp_edit_playlist_create_editfield(mp_playlist_data);
        IF_FREE(new_playlist_name);
 
        mp_popup_response_callback_set(mp_playlist_data->popup,
-                                                                  _mp_edit_playlist_cancel_cb,
-                                                                  mp_playlist_data);
+                       _mp_edit_playlist_cancel_cb,
+                       mp_playlist_data);
        Evas_Object *btn1 =
-               mp_widget_create_button(mp_playlist_data->popup, "popup",
-                                                               STR_MP_CANCEL, NULL,
-                                                               _mp_edit_playlist_cancel_cb,
-                                                               mp_playlist_data);
+                       mp_widget_create_button(mp_playlist_data->popup, "popup",
+                                       STR_MP_CANCEL, NULL,
+                                       _mp_edit_playlist_cancel_cb,
+                                       mp_playlist_data);
 
        if (mp_playlist_data->type == MP_PLST_CREATE
-               || mp_playlist_data->type == MP_PLST_CREATE_TO_ADD_TRACK) {
+                       || mp_playlist_data->type == MP_PLST_CREATE_TO_ADD_TRACK) {
                btn_str = STR_MP_CREATE;
        } else if (mp_playlist_data->type == MP_PLST_RENAME) {
                btn_str = STR_MP_RENAME;
@@ -586,30 +570,30 @@ void mp_edit_playlist_content_create(void *thiz)
        }
 
        Evas_Object *btn2 =
-               mp_widget_create_button(mp_playlist_data->popup, "popup", btn_str,
-                                                               NULL, NULL, NULL);
+                       mp_widget_create_button(mp_playlist_data->popup, "popup", btn_str,
+                                       NULL, NULL, NULL);
 
        mp_playlist_data->btn_ok = btn2;
        elm_object_part_content_set(mp_playlist_data->popup, "button1", btn1);
        elm_object_part_content_set(mp_playlist_data->popup, "button2", btn2);
 
        elm_object_part_content_set(layout, "elm.swallow.content",
-                                                               mp_playlist_data->editfiled_entry);
+                       mp_playlist_data->editfiled_entry);
        elm_object_content_set(mp_playlist_data->popup, layout);
 
        if (mp_playlist_data->type == MP_PLST_RENAME) {
                evas_object_smart_callback_add(btn2, "clicked",
-                                                                          mp_edit_playlist_rename_done_cb,
-                                                                          mp_playlist_data);
+                               mp_edit_playlist_rename_done_cb,
+                               mp_playlist_data);
        } else {
                evas_object_smart_callback_add(btn2, "clicked",
-                                                                          _mp_edit_playlist_create_new_done_cb,
-                                                                          mp_playlist_data);
+                               _mp_edit_playlist_create_new_done_cb,
+                               mp_playlist_data);
        }
 
        if (mp_playlist_data->editfiled_entry && !ad->popup[MP_POPUP_NOTIFY]) {
                mp_playlist_data->entry_show_timer =
-                       ecore_timer_add(0.1, _entry_focus_timer_cb, mp_playlist_data);
+                               ecore_timer_add(0.1, _entry_focus_timer_cb, mp_playlist_data);
        }
 
        return;
@@ -617,7 +601,7 @@ void mp_edit_playlist_content_create(void *thiz)
 
 static void
 _mp_edit_playlist_popup_timeout_cb(void *data, Evas_Object * obj,
-                                                                  void *event_info)
+               void *event_info)
 {
        startfunc;
        mp_evas_object_del(obj);
@@ -631,7 +615,7 @@ _mp_edit_playlist_popup_timeout_cb(void *data, Evas_Object * obj,
 
 static void
 mp_edit_playlist_rename_done_cb(void *data, Evas_Object * obj,
-                                                               void *event_info)
+               void *event_info)
 {
        eventfunc;
        Mp_Playlist_Data *mp_playlist_data = data;
@@ -651,10 +635,10 @@ mp_edit_playlist_rename_done_cb(void *data, Evas_Object * obj,
 
        if (!mp_util_is_playlist_name_valid((char *) text)) {
                mp_widget_notify_cb_popup(ad,
-                                                                 GET_STR
-                                                                 ("IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"),
-                                                                 _mp_edit_playlist_popup_timeout_cb,
-                                                                 (void *) editfiled_entry);
+                               GET_STR
+                               ("IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"),
+                               _mp_edit_playlist_popup_timeout_cb,
+                               (void *) editfiled_entry);
                IF_FREE(text);
                return;
        } else {
@@ -663,12 +647,12 @@ mp_edit_playlist_rename_done_cb(void *data, Evas_Object * obj,
                if (ret != 0) {
                        ERROR_TRACE("Fail to get playlist count by name: %d", ret);
                        mp_widget_text_popup(ad,
-                                                                GET_STR
-                                                                ("IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"));
+                                       GET_STR
+                                       ("IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"));
                } else if (exist) {
                        char *message = NULL;
                        message =
-                               g_strdup_printf(GET_STR(STR_MP_POP_PLAYLIST_EXISTS), text);
+                                       g_strdup_printf(GET_STR(STR_MP_POP_PLAYLIST_EXISTS), text);
                        mp_widget_text_popup(ad, message);
                        IF_FREE(message);
                        mp_edit_playlist_content_create(mp_playlist_data);
@@ -678,13 +662,13 @@ mp_edit_playlist_rename_done_cb(void *data, Evas_Object * obj,
                        if (ret == 0) {
                                mp_debug("mp_media_info_playlist_rename().. OK");
                                MpView_t *create_playlist_detail_view =
-                                       mp_view_mgr_get_view(GET_VIEW_MGR,
-                                                                                MP_VIEW_PLAYLIST_DETAIL);
+                                               mp_view_mgr_get_view(GET_VIEW_MGR,
+                                                               MP_VIEW_PLAYLIST_DETAIL);
                                if (create_playlist_detail_view != NULL) {
                                        mp_view_set_title(create_playlist_detail_view, text);
                                        ((MpPlaylistDetailView_t *)
-                                        create_playlist_detail_view)->
-content_set(create_playlist_detail_view);
+                                                       create_playlist_detail_view)->
+                                                                       content_set(create_playlist_detail_view);
                                }
 
                                mp_view_mgr_post_event(GET_VIEW_MGR, MP_PLAYLIST_RENAMED);
@@ -733,7 +717,7 @@ void *mp_edit_playlist_create(mp_plst_operation_type type)
 }
 
 int mp_edit_playlist_set_edit_list(Mp_Playlist_Data * mp_playlist_data,
-                                                                  MpList_t * adding_list)
+               MpList_t * adding_list)
 {
        startfunc;
        MP_CHECK_VAL(mp_playlist_data, -1);
@@ -742,7 +726,7 @@ int mp_edit_playlist_set_edit_list(Mp_Playlist_Data * mp_playlist_data,
 }
 
 int mp_edit_playlist_set_media_id(Mp_Playlist_Data * mp_playlist_data,
-                                                                 const char *adding_media_id)
+               const char *adding_media_id)
 {
        startfunc;
        MP_CHECK_VAL(mp_playlist_data, -1);
@@ -751,7 +735,7 @@ int mp_edit_playlist_set_media_id(Mp_Playlist_Data * mp_playlist_data,
 }
 
 int mp_edit_playlist_set_create_type(Mp_Playlist_Data * mp_playlist_data,
-                                                                        mp_plst_create_type_e type)
+               mp_plst_create_type_e type)
 {
        MP_CHECK_VAL(mp_playlist_data, -1);
        mp_playlist_data->creation_type = type;

diff --git a/src/widget/mp-list.c b/src/widget/mp-list.c
index a8c3992..47d0441 100644 (file)
--- a/src/widget/mp-list.c
+++ b/src/widget/mp-list.c
@@ -177,8 +177,6 @@ _mp_list_layout_del_cb(void *data, Evas * e, Evas_Object * obj,
        struct appdata *ad = mp_util_get_appdata();
        MP_CHECK(ad);
 
-       ad->del_cb_invoked = 0;
-
        MpList_t *list = data;
        MP_CHECK(list);
 

diff --git a/src/widget/mp-playlist-list.c b/src/widget/mp-playlist-list.c
index 4f790db..a703b9b 100644 (file)
--- a/src/widget/mp-playlist-list.c
+++ b/src/widget/mp-playlist-list.c
@@ -856,24 +856,22 @@ static void _mp_playlist_list_load_list(void *thiz, int count_auto,
        Elm_Object_Item *group_index = NULL;
 
        if (count_auto) {
-               if (!list->edit_mode && !MP_LIST_OBJ_IS_GENGRID(list->genlist)
-                       && (ad->del_cb_invoked == 0)) {
+               if (!list->edit_mode && !MP_LIST_OBJ_IS_GENGRID(list->genlist)) {
                        group_index =
-                               _mp_playlist_append_group_index(list,
-                                                                                               MP_PLAYLIST_GROUP_INDEX_DEFAULT,
-                                                                                               list->
-                                                                                               itc_group_index_default);
+                                       _mp_playlist_append_group_index(list,
+                                                       MP_PLAYLIST_GROUP_INDEX_DEFAULT,
+                                                       list->
+                                                       itc_group_index_default);
                }
                _mp_playlist_append_auto_playlists(list, group_index);
                group_index = NULL;
        }
 
-       if (!list->edit_mode && !MP_LIST_OBJ_IS_GENGRID(list->genlist)
-               && (ad->del_cb_invoked == 0)) {
+       if (!list->edit_mode && !MP_LIST_OBJ_IS_GENGRID(list->genlist)) {
                group_index =
-                       _mp_playlist_append_group_index(list,
-                                                                                       MP_PLAYLIST_GROUP_INDEX_NUM,
-                                                                                       list->itc_group_index_user);
+                               _mp_playlist_append_group_index(list,
+                                               MP_PLAYLIST_GROUP_INDEX_NUM,
+                                               list->itc_group_index_user);
        }
 
        if (count_user) {
@@ -1101,7 +1099,6 @@ static void _mp_playlist_list_update(void *thiz)
        startfunc;
        struct appdata *ad = mp_util_get_appdata();
        MP_CHECK(ad);
-       ad->del_cb_invoked = 0;
        int count_user = 0, count_auto = 0, res = 0, i, playlist_state = 0;
        MpPlaylistList_t *list = thiz;
        MP_CHECK(list);