Tizen 2.4.0 rev3 SDK Public Releasetizen_2.4

6 files changed, 12 insertions, 33 deletions

diff --git a/data/myfile.edc b/data/myfile.edc
index 4db8c91..5357500 100644
--- a/data/myfile.edc
+++ b/data/myfile.edc
@@ -1261,7 +1261,7 @@ group {
 			description {
 				state: "default" 0.0;
 				fixed: 1 1;
-		//		min: 0 SEARCHBAR_HEIGHT_INC;
+				min: 0 SEARCHBAR_HEIGHT_INC;
 				rel1
 				{
 					relative: 0.9 0.0;
@@ -1273,13 +1273,13 @@ group {
 					offset: -3 -3;
 					to: "inner_rect_search";
 				}
-			//	min: 50 50;
+				min: 50 50;
 			}
 			description {
 				state: "landscape" 0.0;
 				align: 1 0;
 				fixed: 1 1;
-			//	min: 0 SEARCHBAR_HEIGHT_INC;
+				min: 0 SEARCHBAR_HEIGHT_INC;
 				rel1
 				{
 					relative: 0.94 0.0;
@@ -1292,7 +1292,7 @@ group {
 					offset: -3 -3;
 					to: "inner_rect_search";
 				}
-			//	min: 50 50;
+				min: 50 50;
 			}
 		}
 		part
diff --git a/org.tizen.myfile.efl b/org.tizen.myfile.efl
index 61f74ac..eaf9f8c 100755
--- a/org.tizen.myfile.efl
+++ b/org.tizen.myfile.efl
@@ -69,7 +69,7 @@ org.tizen.quickpanel org.tizen.myfile --x--- ------
 org.tizen.lockscreen org.tizen.myfile --x--- ------
 org.tizen.cluster-home org.tizen.myfile --x--- ------
 context-service org.tizen.myfile r-x--- ------
-media-server org.tizen.myfile rwx--- ------
+media-server org.tizen.myfile -w---- ------
 nfc-share-service org.tizen.myfile rw---- ------
 isf org.tizen.myfile --x--- ------
 net.wifi-qs org.tizen.myfile --x--- ------
@@ -138,6 +138,4 @@ org.tizen.myfile calendar-service::svc rw---- ------
 org.tizen.myfile org.tizen.myfile -w---- ------
 org.tizen.myfile system::ext_storage_appdata rwxat----- ------
 org.tizen.myfile tizen::vconf::public::r::platform::rw r----- ------
-org.tizen.calendar system::media rwx--- ------
-org.tizen.video-player org.tizen.myfile rwx--- ------
-org.tizen.music-player org.tizen.myfile rwx--- ------
+org.tizen.calendar system::media rwx--- ------
\ No newline at end of file
diff --git a/src/common/file-system/mf-file-attr.c b/src/common/file-system/mf-file-attr.c
index 1e58750..d662cb9 100755
--- a/src/common/file-system/mf-file-attr.c
+++ b/src/common/file-system/mf-file-attr.c
@@ -365,7 +365,7 @@ static fsFileType __mf_file_attr_get_category_by_file_ext(const char *file_ext,
 		}
 		if (strcasecmp("M4A", &file_ext[i]) == 0) {
 			//Fix P131207-02509,keep the type same with the one media_info_get_media_type() gets
-			return FILE_TYPE_MUSIC;
+			return FILE_TYPE_VOICE;
 		}
 		if (strcasecmp("M3G", &file_ext[i]) == 0) {
 			return FILE_TYPE_FLASH;
diff --git a/src/common/mf-callback.c b/src/common/mf-callback.c
index 61d5ff8..5d90324 100755
--- a/src/common/mf-callback.c
+++ b/src/common/mf-callback.c
@@ -1969,7 +1969,7 @@ void mf_callback_long_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 	struct appdata *ap = (struct appdata *)data;
 	mf_retm_if(ap == NULL, "ap is NULL");
 	evas_object_smart_callback_del (ap->mf_MainWindow.pEntry, "clicked", (Evas_Smart_Cb) mf_callback_clicked_cb);
-	//elm_entry_select_none(ap->mf_MainWindow.pEntry);
+	elm_entry_select_none(ap->mf_MainWindow.pEntry);
 	MF_TRACE_END;
 }
 
@@ -2455,7 +2455,7 @@ void mf_callback_paste_here_cb(void *data, Evas_Object *obj, void *event_info)
 
 	ap->mf_FileOperation.pSourceList = pSourceList;
 
-	int ret = mf_copy_copy_items(pSourceList, pDestPath, ap->mf_FileOperation.pCancel, TRUE, ap);
+	int ret = mf_copy_copy_items(pSourceList, pDestPath, ap->mf_FileOperation.pCancel, FALSE, ap);
 	if (ret == 0) {
 		ap->mf_FileOperation.iOperationSuccessFlag = TRUE;
 		mf_fs_monitor_remove_dir_watch();
@@ -2557,7 +2557,7 @@ void mf_callback_move_here_cb(void *data, Evas_Object *obj, void *event_info)
 	ap->mf_FileOperation.iRequestType = MF_REQ_NONE;
 
 	ap->mf_FileOperation.pSourceList = pSourceList;
-	if (mf_move_move_items(pSourceList, pDestPath, ap->mf_FileOperation.pCancel, TRUE, ap) == 0) {
+	if (mf_move_move_items(pSourceList, pDestPath, ap->mf_FileOperation.pCancel, FALSE, ap) == 0) {
 		ap->mf_FileOperation.iOperationSuccessFlag = TRUE;
 		mf_fs_monitor_remove_dir_watch();
 		ap->mf_MainWindow.pProgressPopup = mf_popup_create_pb_popup(ap, LABEL_MOVE, MF_MSG_MOVING, count, mf_callback_progress_bar_cancel_cb, ap);
@@ -3099,7 +3099,7 @@ static void __mf_callback_mmc_removed(void *data, MF_STORAGE storage)
 
 	Evas_Object *entry = NULL;
 	MF_STORAGE optStorage = MYFILE_NONE;
-	char *storage_loc = "/opt/storage";
+
 	optStorage = storage;
 	switch (optStorage) {
 	case MYFILE_PHONE:
@@ -3253,13 +3253,6 @@ static void __mf_callback_mmc_removed(void *data, MF_STORAGE storage)
 		case MORE_DATA_COPYING:
 		case MORE_DATA_MOVING:
 			mf_debug("=====================  MMC  remove ==================");
-			if(strncmp(ap->mf_MainWindow.record.path , storage_loc, strlen(storage_loc)) == 0) {
-				if (ap->mf_MainWindow.pNormalPopup) {
-						evas_object_del(ap->mf_MainWindow.pNormalPopup);
-						ap->mf_MainWindow.pNormalPopup = NULL;
-				}
-				mf_request_set_result(ap->mf_FileOperation.pRequest, MF_REQ_SKIP);
-			}
 			if (ap->mf_MainWindow.record.location == optStorage) {
 				ap->mf_MainWindow.pMmcRemovedPopup = mf_popup_create_popup(ap, POPMODE_TEXT_NOT_DISABLED, NULL,
 											   MF_LABEL_MMC_REMOVED, NULL, NULL, NULL, NULL, NULL);
@@ -3344,10 +3337,6 @@ static void __mf_callback_mmc_removed(void *data, MF_STORAGE storage)
 			if (ap->mf_FileOperation.pCancel) {
 				mf_cancel_do_cancel(ap->mf_FileOperation.pCancel);
 			}
-			if (ap->mf_MainWindow.pProgressPopup) {
-				evas_object_del(ap->mf_MainWindow.pProgressPopup);
-				ap->mf_MainWindow.pProgressPopup = NULL;
-			}
 			ap->mf_MainWindow.pMmcRemovedPopup = mf_popup_create_popup(ap, POPMODE_TEXT_NOT_DISABLED, NULL,
 										   MF_LABEL_MMC_REMOVED, NULL, NULL, NULL, NULL, NULL);
 			mf_navi_bar_reset(ap);
diff --git a/src/common/mf-launch.c b/src/common/mf-launch.c
index 7e7b52c..c0fd75f 100755
--- a/src/common/mf-launch.c
+++ b/src/common/mf-launch.c
@@ -715,16 +715,10 @@ int mf_launch_service(void *data, char *path)
 			} else if(sort_type ==	 MYFILE_SORT_BY_TYPE_Z2A) {
 				app_control_add_extra_data(app_control, "sort_type", "MYFILE_SORT_BY_TYPE_Z2A");
 			}
-			if (ap->mf_Status.view_type != mf_view_root_category) {
-				app_control_add_extra_data(app_control, "launching_application", "myfile");
-			}
 			app_control_add_extra_data(app_control, "enableChangePlayer", "true");
 			ret = app_control_set_uri(app_control, path);
 			app_control_set_mime(app_control, "audio/*");
 		} else {
-			if (ap->mf_Status.view_type != mf_view_root_category) {
-				app_control_add_extra_data(app_control, "launching_application", "myfile");
-			}
 			ret = app_control_set_uri(app_control, path);
 		}
 		if (ret != APP_CONTROL_ERROR_NONE) {
diff --git a/src/common/mf-util.c b/src/common/mf-util.c
index 6aea114..69b142b 100755
--- a/src/common/mf-util.c
+++ b/src/common/mf-util.c
@@ -1683,11 +1683,9 @@ void mf_util_generate_list_prepend(Eina_List **list, const char *path, int file_
 	mf_retm_if(path == NULL, "path is NULL");
 
 	fsNodeInfo *pNode = mf_util_generate_pnode(path, file_type);
-	char *ext = NULL;
-	mf_file_attr_get_file_ext(path, &ext);
+
 	if (pNode) {
 		pNode->list_type = list_type;
-		pNode->ext = ext;
 		*list = eina_list_prepend(*list, pNode);
 	}
 }