From e464e8c6f446ab346d03bd3c1ee6e35b90bf30b8 Mon Sep 17 00:00:00 2001
From: "lke01.lee" <lke01.lee@samsung.com>
Date: Wed, 26 Dec 2012 10:07:04 +0900
Subject: [PATCH] livebox configuration valuables have been changed

[Issue#] N/A
[Problem]
[Cause] N/A
[Solution] livebox configuration valuables have been changed

Change-Id: I538dc45ca8ab8721da51e4be4fd3ba0f9956f5cf
---
 modules/widget_dao/dao/config_parser_data.cpp           | 14 ++++----------
 .../include/dpl/wrt-dao-ro/config_parser_data.h         | 17 +++++++----------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/modules/widget_dao/dao/config_parser_data.cpp b/modules/widget_dao/dao/config_parser_data.cpp
index 9b71b0f..2fbd0f6 100755
--- a/modules/widget_dao/dao/config_parser_data.cpp
+++ b/modules/widget_dao/dao/config_parser_data.cpp
@@ -460,26 +460,20 @@ bool ConfigParserData::ServiceInfo::operator!= (const ServiceInfo& info) const
 
 bool ConfigParserData::LiveboxInfo::operator==(const LiveboxInfo& other) const
 {
-    return m_appId == other.m_appId &&
+    return m_liveboxId == other.m_liveboxId &&
         m_autoLaunch == other.m_autoLaunch &&
-        m_period == other.m_period &&
-        m_network == other.m_network &&
-        m_nodisplay == other.m_nodisplay &&
+        m_updatePeriod == other.m_updatePeriod &&
         m_primary == other.m_primary &&
-        m_timeout == other.m_timeout &&
         m_label == other.m_label &&
         m_icon == other.m_icon;
 }
 
 bool ConfigParserData::LiveboxInfo::operator!=(const LiveboxInfo& other) const
 {
-    return m_appId != other.m_appId &&
+    return m_liveboxId != other.m_liveboxId &&
 	 m_autoLaunch != other.m_autoLaunch &&
-        m_period != other.m_period &&
-        m_network != other.m_network &&
-        m_nodisplay != other.m_nodisplay &&
+        m_updatePeriod != other.m_updatePeriod &&
         m_primary != other.m_primary &&
-        m_timeout != other.m_timeout &&
         m_label != other.m_label &&
         m_icon != other.m_icon;
 }
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 60c5879..2520bd4 100755
--- 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
@@ -212,25 +212,22 @@ class ConfigParserData
     {
         LiveboxInfo() { }
 
-        struct Box
+        struct BoxContent
         {
             DPL::String m_boxSrc;
             BoxSizeList m_boxSize ;
             DPL::String m_pdSrc;
             DPL::String m_pdWidth;
             DPL::String m_pdHeight;
-        }; typedef Box BoxInfo;
+        }; typedef BoxContent BoxContentInfo;
 
-        DPL::String m_appId;
-        DPL::String m_autoLaunch;
-        DPL::String m_period;
-        DPL::String m_network;
-        DPL::String m_nodisplay;
-        DPL::String m_primary;
-        DPL::String m_timeout;
         DPL::String m_label;
         DPL::String m_icon;
-        BoxInfo m_boxInfo;
+        DPL::String m_liveboxId;
+        DPL::String m_primary;
+        DPL::String m_autoLaunch;
+        DPL::String m_updatePeriod;
+        BoxContentInfo m_boxInfo;
 
         bool operator==(const LiveboxInfo&) const;
         bool operator!=(const LiveboxInfo&) const;
-- 
2.7.4