From 957c86ead37d7f3729719ac67092ae1a138f6d53 Mon Sep 17 00:00:00 2001 From: Jihoon Chung Date: Fri, 10 May 2013 20:14:25 +0900 Subject: [PATCH] [Release] wrt-commons_0.2.119 --- modules/widget_dao/dao/config_parser_data.cpp | 10 ++++++++++ .../include/dpl/wrt-dao-ro/config_parser_data.h | 17 +++++++++++++++++ packaging/wrt-commons.spec | 4 ++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/modules/widget_dao/dao/config_parser_data.cpp b/modules/widget_dao/dao/config_parser_data.cpp index 4477344..4bf4857 100644 --- a/modules/widget_dao/dao/config_parser_data.cpp +++ b/modules/widget_dao/dao/config_parser_data.cpp @@ -413,4 +413,14 @@ bool ConfigParserData::LiveboxInfo::operator!=(const LiveboxInfo& other) const m_label != other.m_label && m_icon != other.m_icon; } + +bool ConfigParserData::Metadata::operator== (const Metadata& other) const +{ + return key == other.key && value == other.value; +} + +bool ConfigParserData::Metadata::operator!= (const Metadata& other) const +{ + return key != other.key || value != other.value; +} } // namespace WrtDB 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 index 2a85422..bc78fe4 100644 --- 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 @@ -254,6 +254,21 @@ class ConfigParserData }; typedef std::list AllowNavigationInfoList; + struct Metadata + { + Metadata(const DPL::String& _key, + const DPL::String& _value) : + key(_key), + value(_value) + {} + DPL::String key; + DPL::String value; + + bool operator==(const Metadata&) const; + bool operator!=(const Metadata&) const; + }; + typedef std::list MetadataList; + enum class SecurityModelVersion { SECURITY_MODEL_V1 = 0, // WARP SECURITY_MODEL_V2 // CSP, allow-navigation @@ -327,6 +342,8 @@ class ConfigParserData AccountProvider accountProvider; // security model version SecurityModelVersion securityModelVersion; + // security model version + MetadataList metadataList; ConfigParserData() : flashNeeded(false), diff --git a/packaging/wrt-commons.spec b/packaging/wrt-commons.spec index 53a2bf2..1087f63 100644 --- a/packaging/wrt-commons.spec +++ b/packaging/wrt-commons.spec @@ -1,7 +1,7 @@ -#git:framework/web/wrt-commons wrt-commons 0.2.118 +#git:framework/web/wrt-commons wrt-commons 0.2.119 Name: wrt-commons Summary: Wrt common library -Version: 0.2.118 +Version: 0.2.119 Release: 1 Group: Development/Libraries License: Apache License, Version 2.0 -- 2.7.4