From: Jan Olszak <j.olszak@tizendev.org>
Date: Fri, 30 Nov 2012 11:28:57 +0000 (+0900)
Subject: Revert "Pkgname (tizen id) - not null"
X-Git-Tag: submit/trunk/20121210.024828~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d8686664ca96d6336213a0a37923e7d5f8aa125;p=platform%2Fframework%2Fweb%2Fwrt-plugins-common.git

Revert "Pkgname (tizen id) - not null"

This reverts commit 8fab69d481c6ef5979c301a133d4375f1779e931
---

diff --git a/src/modules/tizen/WidgetDB/WidgetDB.cpp b/src/modules/tizen/WidgetDB/WidgetDB.cpp
index f4d9f11..560aabd 100644
--- a/src/modules/tizen/WidgetDB/WidgetDB.cpp
+++ b/src/modules/tizen/WidgetDB/WidgetDB.cpp
@@ -368,7 +368,7 @@ std::string WidgetDB::getWidgetPersistentStoragePath() const
     Try
     {
         WrtDB::WidgetDAOReadOnly dao(getWidgetId());
-        return WrtDB::WidgetConfig::GetWidgetPersistentStoragePath(dao.getPkgname_NOTNULL());
+        return WrtDB::WidgetConfig::GetWidgetPersistentStoragePath(*dao.getPkgname());
     }
     Catch(DPL::Exception)
     {
@@ -381,7 +381,7 @@ std::string WidgetDB::getWidgetTemporaryStoragePath() const
     Try
     {
         WrtDB::WidgetDAOReadOnly dao(getWidgetId());
-        return WrtDB::WidgetConfig::GetWidgetTemporaryStoragePath(dao.getPkgname_NOTNULL());
+        return WrtDB::WidgetConfig::GetWidgetTemporaryStoragePath(*dao.getPkgname());
     }
     Catch(DPL::Exception)
     {
diff --git a/src/modules/tizen/WidgetInterfaceDAO/WidgetInterfaceDAO.cpp b/src/modules/tizen/WidgetInterfaceDAO/WidgetInterfaceDAO.cpp
index 522e93d..246c99f 100644
--- a/src/modules/tizen/WidgetInterfaceDAO/WidgetInterfaceDAO.cpp
+++ b/src/modules/tizen/WidgetInterfaceDAO/WidgetInterfaceDAO.cpp
@@ -329,9 +329,9 @@ std::string WidgetInterfaceDAO::databaseFileName(int widgetHandle)
     Try
     {
         WrtDB::WidgetDAOReadOnly widgetDAO(widgetHandle);
-        DPL::String pkgname = widgetDAO.getPkgname_NOTNULL();
+        DPL::Optional<DPL::String> pkgname = widgetDAO.getPkgname();
 
-        filename << GetWidgetPersistentStoragePath(pkgname)
+        filename << GetWidgetPersistentStoragePath(*pkgname)
                  << "/"
                  << GetWidgetInterfaceDatabaseFile();
     }