Revert "Fix installation of widgets using "defaultlocale" attribute."

This reverts commit a702e45a1c07816e5659561012f3a3170ec77eda.

Change-Id: Iba12f6f1ac8df114bbd33208e58c409a1be0729f

diff --git a/src/pkg-manager/CMakeLists.txt b/src/pkg-manager/CMakeLists.txt
index cad802d..c1ce69d 100755 (executable)
--- a/src/pkg-manager/CMakeLists.txt
+++ b/src/pkg-manager/CMakeLists.txt
@@ -21,7 +21,6 @@ SET(BACKLIB_SRCS
     ${PROJECT_SOURCE_DIR}/src/configuration_parser/ignoring_parser.cpp
     ${PROJECT_SOURCE_DIR}/src/configuration_parser/deny_all_parser.cpp
     ${PROJECT_SOURCE_DIR}/src/configuration_parser/libiriwrapper.cpp
-    ${PROJECT_SOURCE_DIR}/src/wrt-installer/language_subtag_rst_tree.cpp
 )
 
 PKG_CHECK_MODULES(WRT_BACKLIB_PKGS
@@ -34,7 +33,6 @@ PKG_CHECK_MODULES(WRT_BACKLIB_PKGS
     pkgmgr
     dlog
     libpcrecpp
-    libiri
     REQUIRED)
 
 INCLUDE_DIRECTORIES(

diff --git a/src/pkg-manager/backendlib.cpp b/src/pkg-manager/backendlib.cpp
index f783f8c..48f98d4 100644 (file)
--- a/src/pkg-manager/backendlib.cpp
+++ b/src/pkg-manager/backendlib.cpp
@@ -255,16 +255,6 @@ int getConfigParserData(const std::string &widgetPath, ConfigParserData& configI
     const char* CONFIG_XML = "config.xml";
     const char* WITH_OSP_XML = "res/wgt/config.xml";
 
-    try
-    {
-        WrtDB::WrtDatabase::attachToThreadRO();
-    }
-    catch (const DPL::DB::SqlConnection::Exception::ConnectionBroken& ex)
-    {
-        LogError("Could not attach to DB: " << ex.GetMessage());
-        return FALSE;
-    }
-
     Try {
         ParserRunner parser;
 
@@ -296,43 +286,35 @@ int getConfigParserData(const std::string &widgetPath, ConfigParserData& configI
     }
     Catch(DPL::ZipInput::Exception::OpenFailed)
     {
-        WrtDB::WrtDatabase::detachFromThread();
         LogError("Failed to open widget package");
         return FALSE;
     }
     Catch(DPL::ZipInput::Exception::OpenFileFailed)
     {
-        WrtDB::WrtDatabase::detachFromThread();
         LogError("Failed to open config.xml file");
         return FALSE;
     }
     Catch(DPL::CopyFailed)
     {
-        WrtDB::WrtDatabase::detachFromThread();
         LogError("Failed to extract config.xml file");
         return FALSE;
     }
     Catch(DPL::FileInput::Exception::OpenFailed)
     {
-        WrtDB::WrtDatabase::detachFromThread();
         LogError("Failed to open config.xml file");
         return FALSE;
     }
     Catch(ElementParser::Exception::ParseError)
     {
-        WrtDB::WrtDatabase::detachFromThread();
         LogError("Failed to parse config.xml file");
         return FALSE;
     }
     Catch(DPL::ZipInput::Exception::SeekFileFailed)
     {
-        WrtDB::WrtDatabase::detachFromThread();
         LogError("Failed to seek widget archive - corrupted package?");
         return FALSE;
     }
 
-    WrtDB::WrtDatabase::detachFromThread();
-
     return TRUE;
 }