From 05ab5eaeef74b809d0fbc69bcbba3e8ceca4b29e Mon Sep 17 00:00:00 2001 From: Zbigniew Kostrzewa Date: Wed, 13 Feb 2013 10:03:26 +0100 Subject: [PATCH 1/1] Revert "Unused fields in WidgetRegisterInfo" This reverts commit 19e65d3fdcde442f24e99d4df014d9ccb1bcb74e. --- modules/widget_dao/dao/widget_dao.cpp | 11 +++++++++-- .../widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h | 1 + .../widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/widget_dao/dao/widget_dao.cpp b/modules/widget_dao/dao/widget_dao.cpp index 65ea027..6529fd0 100644 --- a/modules/widget_dao/dao/widget_dao.cpp +++ b/modules/widget_dao/dao/widget_dao.cpp @@ -380,8 +380,15 @@ DbWidgetHandle WidgetDAO::registerWidgetInfo( row.Set_app_id(*handle); } - row.Set_widget_type(regInfo.webAppType.appType); - + if (regInfo.webAppType == APP_TYPE_UNKNOWN && regInfo.type != + APP_TYPE_UNKNOWN) + { + // TODO : regInfo.type is temporary code for security. + // This code will be removed. + row.Set_widget_type(regInfo.type.appType); + } else { + row.Set_widget_type(regInfo.webAppType.appType); + } row.Set_widget_id(widgetConfigurationInfo.widget_id); row.Set_defaultlocale(widgetConfigurationInfo.defaultlocale); row.Set_widget_version(widgetConfigurationInfo.version); 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 f56be55..c6ae0bd 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 @@ -299,6 +299,7 @@ class ConfigParserData IconsList iconsList; // tizen id / required platform min version for TIZEN webapp + DPL::OptionalString tizenId; DPL::OptionalString tizenMinVersionRequired; DPL::OptionalString tizenPkgId; DPL::OptionalString tizenAppId; diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h b/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h index c2b1de2..a7cd866 100644 --- a/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h +++ b/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h @@ -163,6 +163,7 @@ struct WidgetRegisterInfo {} WidgetType webAppType; + WidgetType type; // TODO : This type will be removed. DPL::OptionalString guid; DPL::OptionalString version; DPL::OptionalString minVersion; @@ -173,6 +174,8 @@ struct WidgetRegisterInfo ConfigParserData configInfo; LocalizationData localizationData; + DPL::OptionalString pkgname; + WidgetPkgName pkgName; TizenPkgId tzPkgid; TizenAppId tzAppid; -- 2.7.4