[Release] wrt-commons_0.2.133

Change-Id: I3fa79983fd949d22f74740722ae1fa6817693f96

diff --git a/modules/log/src/dlog_log_provider.cpp b/modules/log/src/dlog_log_provider.cpp
index 943369f..573ee89 100644 (file)
--- a/modules/log/src/dlog_log_provider.cpp
+++ b/modules/log/src/dlog_log_provider.cpp
@@ -57,8 +57,13 @@ void DLOGLogProvider::Debug(const char *message,
                             int line,
                             const char *function)
 {
+#ifdef SECURE_LOG
+    SECURE_LOG(LOG_DEBUG, m_tag.Get(), "%s",
+        FormatMessage(message, filename, line, function).c_str());
+#else
     LOG(LOG_DEBUG, m_tag.Get(), "%s",
         FormatMessage(message, filename, line, function).c_str());
+#endif
 }
 
 void DLOGLogProvider::Info(const char *message,
@@ -66,8 +71,13 @@ void DLOGLogProvider::Info(const char *message,
                            int line,
                            const char *function)
 {
+#ifdef SECURE_LOG
+    SECURE_LOG(LOG_INFO, m_tag.Get(), "%s",
+        FormatMessage(message, filename, line, function).c_str());
+#else
     LOG(LOG_INFO, m_tag.Get(), "%s",
         FormatMessage(message, filename, line, function).c_str());
+#endif
 }
 
 void DLOGLogProvider::Warning(const char *message,
@@ -75,8 +85,13 @@ void DLOGLogProvider::Warning(const char *message,
                               int line,
                               const char *function)
 {
+#ifdef SECURE_LOG
+    SECURE_LOG(LOG_WARN, m_tag.Get(), "%s",
+        FormatMessage(message, filename, line, function).c_str());
+#else
     LOG(LOG_WARN, m_tag.Get(), "%s",
         FormatMessage(message, filename, line, function).c_str());
+#endif
 }
 
 void DLOGLogProvider::Error(const char *message,
@@ -84,8 +99,13 @@ void DLOGLogProvider::Error(const char *message,
                             int line,
                             const char *function)
 {
+#ifdef SECURE_LOG
+    SECURE_LOG(LOG_ERROR, m_tag.Get(), "%s",
+        FormatMessage(message, filename, line, function).c_str());
+#else
     LOG(LOG_ERROR, m_tag.Get(), "%s",
         FormatMessage(message, filename, line, function).c_str());
+#endif
 }
 
 void DLOGLogProvider::Pedantic(const char *message,
@@ -93,10 +113,17 @@ void DLOGLogProvider::Pedantic(const char *message,
                                int line,
                                const char *function)
 {
+#ifdef SECURE_LOG
+    SECURE_LOG(LOG_DEBUG, "DPL", "%s", FormatMessage(message,
+                                              filename,
+                                              line,
+                                              function).c_str());
+#else
     LOG(LOG_DEBUG, "DPL", "%s", FormatMessage(message,
                                               filename,
                                               line,
                                               function).c_str());
+#endif
 }
 }
 } // namespace DPL

diff --git a/modules/utils/src/warp_iri.cpp b/modules/utils/src/warp_iri.cpp
index 4f6aa0c..b00f257 100644 (file)
--- a/modules/utils/src/warp_iri.cpp
+++ b/modules/utils/src/warp_iri.cpp
@@ -42,7 +42,7 @@ namespace {
 
 const char *IRI_IGNORED_SCHEME[] = { "file://", "widget://", "app://", "tel:",
                                      "sms:", "mmsto:", "mailto:", "data:", "blob:",
-                                     0 };
+                                     "tizen-service:", 0 };
 
 const DPL::String SCHEMA_HTTP = DPL::FromUTF8String("http");
 const DPL::String SCHEMA_HTTPS = DPL::FromUTF8String("https");

diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h b/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h
old mode 100755 (executable)
new mode 100644 (file)
index d0ecc41..eceaaec
--- a/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h
+++ b/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h
@@ -180,13 +180,19 @@ class ConfigParserData
 
     typedef std::list<AppControlInfo> AppControlInfoList;
 
-    typedef std::list<std::pair<DPL::String, DPL::String> > BoxSizeList;
-    typedef std::list<std::pair<DPL::String, DPL::String> > BoxLabelList;
-
     struct LiveboxInfo
     {
         LiveboxInfo() { }
 
+        struct BoxSize
+        {
+            DPL::String m_size;
+            DPL::String m_preview;
+            DPL::String m_useDecoration;
+        };
+        typedef BoxSize BoxSizeInfo;
+        typedef std::list<BoxSizeInfo> BoxSizeList;
+
         struct BoxContent
         {
             DPL::String m_boxSrc;
@@ -200,6 +206,8 @@ class ConfigParserData
         };
         typedef BoxContent BoxContentInfo;
 
+        typedef std::list<std::pair<DPL::String, DPL::String> > BoxLabelList;
+
         BoxLabelList m_label;
         DPL::String m_icon;
         DPL::String m_liveboxId;
@@ -257,13 +265,13 @@ class ConfigParserData
 
     struct Metadata
     {
-        Metadata(const DPL::String& _key,
-                 const DPL::String& _value) :
+        Metadata(const DPL::OptionalString& _key,
+                 const DPL::OptionalString& _value) :
             key(_key),
             value(_value)
         {}
-        DPL::String key;
-        DPL::String value;
+        DPL::OptionalString key;
+        DPL::OptionalString value;
 
         bool operator==(const Metadata&) const;
         bool operator!=(const Metadata&) const;

diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h b/modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h
index 2a04b13..cf5647b 100644 (file)
--- a/modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h
+++ b/modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h
@@ -304,6 +304,15 @@ inline const char* GetWidgetResPath()
 {
     return "/res";
 }
+
+inline const char* GetNPRuntimePluginsPath()
+{
+#ifdef __arm__
+    return "plugins/arm";
+#else
+    return "plugins/x86";
+#endif
+}
 } // namespace GlobalConfig
 } // namespace WrtDB
 

diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/widget_config.h b/modules/widget_dao/include/dpl/wrt-dao-ro/widget_config.h
index 643ff7b..c452814 100644 (file)
--- a/modules/widget_dao/include/dpl/wrt-dao-ro/widget_config.h
+++ b/modules/widget_dao/include/dpl/wrt-dao-ro/widget_config.h
@@ -98,6 +98,14 @@ inline std::string GetWidgetSharedResStoragePath(DPL::String tzPkgId)
                .Concat(GlobalConfig::GetWidgetResPath())
                .GetFullPath();
 }
+
+inline std::string GetWidgetNPRuntimePluginsPath(const DPL::String& tzPkgId)
+{
+    return PathBuilder(GetWidgetBasePath(tzPkgId))
+                .Concat(GlobalConfig::GetWidgetSrcPath())
+                .Append(GlobalConfig::GetNPRuntimePluginsPath())
+                .GetFullPath();
+}
 } // namespace WidgetConfig
 } // namespace WrtDB
 

diff --git a/packaging/wrt-commons.spec b/packaging/wrt-commons.spec
index 6acaec0..87da17f 100644 (file)
--- a/packaging/wrt-commons.spec
+++ b/packaging/wrt-commons.spec
@@ -1,7 +1,7 @@
 #git:framework/web/wrt-commons
 Name:       wrt-commons
 Summary:    Wrt common library
-Version:    0.2.128
+Version:    0.2.133
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0