[Release] wrt-setting_0.0.34

diff --git a/packaging/wrt-setting.spec b/packaging/wrt-setting.spec
index 26e485c..907ac53 100644 (file)
--- a/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@ -1,5 +1,5 @@
 Name: wrt-setting
-Version: 0.0.33
+Version: 0.0.34
 Release: 1
 Summary: WRT Setting UI Gadgets
 Group:   Development/Libraries

diff --git a/webapp-detail/exceptionsview.cpp b/webapp-detail/exceptionsview.cpp
index b4c6429..d8dd3f5 100644 (file)
--- a/webapp-detail/exceptionsview.cpp
+++ b/webapp-detail/exceptionsview.cpp
@@ -16,7 +16,6 @@
 
 #include "exceptionsview.h"
 
-#include <map>
 #include <vector>
 #include <string>
 #include <cstring>
@@ -25,7 +24,6 @@
 #include <dpl/foreach.h>
 #include <dpl/assert.h>
 #include <dpl/string.h>
-#include <dpl/wrt-dao-ro/widget_dao_types.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 #include <wrt-commons/security-origin-dao/security_origin_dao.h>
 
@@ -47,12 +45,8 @@ const char* const ELM_GENLIST_ITEM_CLASS_STYLE_DEFAULT = "default";
 const char* const ELM_GENLIST_ITEM_CLASS_STYLE_3TEXT_1ICON = "3text.1icon";
 const char* const EVAS_SMART_CALLBACK_CLICKED = "clicked";
 // TEXT
-std::map<WrtDB::Feature, std::string>  featureText = {
-    {WrtDB::FEATURE_GEOLOCATION, "Geolocation"},
-    {WrtDB::FEATURE_WEB_NOTIFICATION, "Web Notification"},
-    {WrtDB::FEATURE_USER_MEDIA, "User Media"},
-    {WrtDB::FEATURE_FULLSCREEN_MODE, "Fullscreen Mode"}
-};
+std::vector<std::string> featureText =
+    {"Geolocation", "Web Notification", "Web database", "FileSystem API"};
 std::vector<std::string> resultText = {"Allow", "Deny"};
 const unsigned int INDEX_TEXT_ALLOW = 0;
 const unsigned int INDEX_TEXT_DENY = 1;
@@ -194,12 +188,17 @@ char* ExceptionsView::getTextCallback(
         return strdup(
             featureText[settingsData->m_originData.feature].c_str());
     } else if (partStr == ELM_PART_TEXT_2) {
-        std::string url = DPL::ToUTF8String(settingsData->m_originData.origin.scheme);
-        if (!url.empty()) {
-            url += "://";
+        // display host text
+        if (DPL::ToUTF8String(settingsData->m_originData.origin.scheme) ==
+                SCHEME_FILE)
+        {
+            // in case of file scheme, display "local"
+            return strdup(TEXT_LOCAL);
+        } else {
+            return strdup(
+                DPL::ToUTF8String(
+                    settingsData->m_originData.origin.host).c_str());
         }
-        url += DPL::ToUTF8String(settingsData->m_originData.origin.host);
-        return strdup(url.c_str());
     } else if (partStr == ELM_PART_TEXT_3) {
         // display result text
         Result result =