summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDongeup Ham <dongeup.ham@samsung.com>2013-02-27 09:51:49 +0900
committerDongeup Ham <dongeup.ham@samsung.com>2013-02-27 09:51:49 +0900
commit0959a8322633132fdb32d1fd4668e7b8fcc13a00 (patch)
treee3260110ff272d248ce41aec43f5940cecf0113f /src
parent01d77d2b03a5a4ef58400f99604b22d54f387a2c (diff)
downloadinstaller-0959a8322633132fdb32d1fd4668e7b8fcc13a00.tar.gz
installer-0959a8322633132fdb32d1fd4668e7b8fcc13a00.tar.bz2
installer-0959a8322633132fdb32d1fd4668e7b8fcc13a00.zip
Implementation for new livebox tags
Change-Id: I181b3c5320dafc66b8279ba53155149c7cee02bd Signed-off-by: Dongeup Ham <dongeup.ham@samsung.com>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/Context/InstallationContextData.h2
-rwxr-xr-xsrc/XmlHandler/ManifestGenerator.cpp2
-rwxr-xr-xsrc/XmlHandler/Parser/ManifestLiveboxesParser.cpp13
3 files changed, 11 insertions, 6 deletions
diff --git a/src/Context/InstallationContextData.h b/src/Context/InstallationContextData.h
index 5dba61e..5683a7c 100755
--- a/src/Context/InstallationContextData.h
+++ b/src/Context/InstallationContextData.h
@@ -52,7 +52,7 @@ public:
result AddSize(Tizen::Base::String* pSize, Tizen::Base::String* pPreviewImage);
Tizen::Base::Collection::HashMap* GetSizeList(void) const;
- Tizen::Base::String __main;
+ Tizen::Base::String __default;
Tizen::Base::String __configurationAppControlAppId;
private:
diff --git a/src/XmlHandler/ManifestGenerator.cpp b/src/XmlHandler/ManifestGenerator.cpp
index dbeb6e4..236badd 100755
--- a/src/XmlHandler/ManifestGenerator.cpp
+++ b/src/XmlHandler/ManifestGenerator.cpp
@@ -224,7 +224,7 @@ ManifestGenerator::WriteLiveboxes(AppData* pAppData) const
IMap* pLiveboxNameList = pLiveboxData->GetNameList();
IMap* pSizeList = pLiveboxData->GetSizeList();
String popupEnabled = pLiveboxData->GetPopupEnabled();
- String primary = pLiveboxData->__main;
+ String primary = pLiveboxData->__default;
__pWriter->StartElement("livebox");
diff --git a/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp b/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
index 959457c..d18ecff 100755
--- a/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
+++ b/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
@@ -168,11 +168,16 @@ ManifestLiveboxesParser::OnLiveboxStartElement(void)
AppLog(" - LiveboxPopupEnabled=%s", pLiveboxPopupEnabled);
}
- char *pMain = pAttr->Find("Main");
- if (pMain)
+ char* pDefault = pAttr->Find("Default");
+ if (pDefault == null)
{
- __pLiveboxData->__main = pMain;
- AppLog(" - Main=%s", pMain);
+ pDefault = pAttr->Find("Main");
+ }
+
+ if (pDefault)
+ {
+ __pLiveboxData->__default = pDefault;
+ AppLog(" - Default=%s", pDefault);
}
return true;