From: Jihye Kang <jye.kang@samsung.com>
Date: Sat, 29 Jun 2013 06:43:08 +0000 (+0900)
Subject: Bug fix on multiple selection of file picker
X-Git-Tag: submit/tizen_2.2/20130714.131554~86
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71bf5a11727d4b85b6435cf7c44ec347e3c0ddd6;p=framework%2Fweb%2Fwebkit-efl.git

Bug fix on multiple selection of file picker

[Title] Bug fix on multiple selection of file picker
[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] N/A

Change-Id: Ib9d61f4508256b752c006989cdabf6c7b65c59b6
---

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.cpp
index 679faed..dc7bb2d 100755
--- a/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.cpp
@@ -124,16 +124,16 @@ static void _cameraResultCb(service_h request, service_h reply, service_result_e
     TIZEN_LOGI("result(%d)", result);
 
     if (result == SERVICE_RESULT_SUCCEEDED) {
-        char** resultFilename[] = {0, };
+        char** resultFilename = 0;
         int length = 0;
-        int ret = service_get_extra_data_array(reply, SERVICE_DATA_SELECTED, &(*resultFilename), &length);
+        int ret = service_get_extra_data_array(reply, SERVICE_DATA_SELECTED, &resultFilename, &length);
         if (ret != SERVICE_ERROR_NONE)
             return;
 
         if (length) {
              Eina_List* list = 0;
              for (int i = 0; i < length; ++i) {
-                char* result = *(resultFilename[i]);
+                char* result = resultFilename[i];
                 int len = strlen(result) + 1;
                 char* fileName = static_cast<char*>(malloc(sizeof(char) * len));
                 memset(fileName, 0, sizeof(char) * len);
@@ -156,7 +156,7 @@ bool OpenPanel::_capturePicture()
         return false;
 
     service_set_operation(svcHandle, SERVICE_OPERATION_CREATE_CONTENT);
-    service_set_mime(svcHandle, "image/*");
+    service_set_mime(svcHandle, "image/jpg");
     service_add_extra_data(svcHandle, "CALLER", "webkit");
     service_add_extra_data(svcHandle, "http://tizen.org/appcontrol/data/camera/allow_switch", "false");
 
@@ -179,7 +179,7 @@ bool OpenPanel::_recordVideo()
         return false;
 
     service_set_operation(svcHandle, SERVICE_OPERATION_CREATE_CONTENT);
-    service_set_mime(svcHandle, "video/*");
+    service_set_mime(svcHandle, "video/3gp");
     service_add_extra_data(svcHandle, "CALLER", "webkit");
     service_add_extra_data(svcHandle, "http://tizen.org/appcontrol/data/camera/allow_switch", "false");
 
@@ -292,11 +292,11 @@ bool OpenPanel::openPanel(Evas_Object* ewkView, Eina_Bool allow_multiple_files,
     else
         service_set_mime(service, "*/*");
 
-    if (allow_multiple_files == TRUE){
+    if (allow_multiple_files)
         service_add_extra_data(service, "http://tizen.org/appcontrol/data/selection_mode", "multiple");
-    } else {
+    else
         service_add_extra_data(service, "http://tizen.org/appcontrol/data/selection_mode", "single");
-    }
+
 
     service_set_app_id (service, "tizen.filemanager");