From 256ab6e2b4943c40fd290af6622804ceebd3b82e Mon Sep 17 00:00:00 2001
From: "sung-su.kim" <sung-su.kim@samsung.com>
Date: Thu, 8 Aug 2013 16:51:44 +0900
Subject: [PATCH] [Release] wrt-plugins-common_0.3.108

Change-Id: Ieee98526eb25c711471feb7bb6dcf195bfc1f7f8
---
 packaging/wrt-plugins-common.spec          |  8 +++++++-
 src/plugins-api-support/PluginRegistry.cpp | 16 ++++++++++++++++
 src/plugins-installer/plugin_installer.cpp |  2 +-
 tests/dao/widgetdb_tests_prepare_db.sh     | 12 ++++++------
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/packaging/wrt-plugins-common.spec b/packaging/wrt-plugins-common.spec
index 006b37e..726f354 100644
--- a/packaging/wrt-plugins-common.spec
+++ b/packaging/wrt-plugins-common.spec
@@ -1,7 +1,7 @@
 #git:framework/web/wrt-plugins-common
 Name:       wrt-plugins-common
 Summary:    wrt-plugins common library
-Version:    0.3.105
+Version:    0.3.108
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
@@ -42,6 +42,12 @@ wrt-plugins common library development headers
 %endif
 
 %build
+%if 0%{?tizen_build_binary_release_type_eng}
+export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE"
+export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
+%endif
+
 export LDFLAGS+="-Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--hash-style=both"
 
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}  \
diff --git a/src/plugins-api-support/PluginRegistry.cpp b/src/plugins-api-support/PluginRegistry.cpp
index adf6563..c4bc496 100644
--- a/src/plugins-api-support/PluginRegistry.cpp
+++ b/src/plugins-api-support/PluginRegistry.cpp
@@ -31,7 +31,9 @@
 #include <algorithm>
 
 #include <dpl/log/log.h>
+#include <dpl/log/secure_log.h>
 #include <dpl/foreach.h>
+#include <dpl/scope_guard.h>
 
 namespace WrtPluginsApi {
 void PluginRegistry::AddPlugin(const std::string& libraryName,
@@ -87,6 +89,20 @@ void PluginRegistry::UnloadAll()
                 LogError("Error: " << (error != NULL ? error : "unknown"));
                 continue;
             }
+            DPL_SCOPE_EXIT(handle) {
+                if (dlclose(handle) != 0) {
+                    const char* error = dlerror();
+                    if (error != NULL)
+                    {
+                        std::string errstr{error};
+                        _E("%s", errstr.c_str());
+                    }
+                    else
+                    {
+                        _E("unknown error while closing plug-in library");
+                    }
+                }
+            };
 
             ExportedApi* entryPoint =
                 static_cast<ExportedApi*>
diff --git a/src/plugins-installer/plugin_installer.cpp b/src/plugins-installer/plugin_installer.cpp
index 44bce08..645bc72 100644
--- a/src/plugins-installer/plugin_installer.cpp
+++ b/src/plugins-installer/plugin_installer.cpp
@@ -418,7 +418,7 @@ int PluginsInstaller::installAllPlugins()
     if (0 != return_code)
         LogError("Error while reading directory.");
 
-    if (-1 == TEMP_FAILURE_RETRY(closedir(dir))) {
+    if (-1 == closedir(dir)) {
         LogError("Failed to close dir: " << PLUGIN_PATH);
     }
 
diff --git a/tests/dao/widgetdb_tests_prepare_db.sh b/tests/dao/widgetdb_tests_prepare_db.sh
index 2476011..4776df8 100755
--- a/tests/dao/widgetdb_tests_prepare_db.sh
+++ b/tests/dao/widgetdb_tests_prepare_db.sh
@@ -53,7 +53,7 @@ if [ "x$1" == "xstart" ]; then
     INS_ALL_WIDGET_STARTFILE="insert into WidgetStartFile(app_id, src)"
     INS_ALL_WIDGET_LOC_STARTFILE="insert into WidgetLocalizedStartFile(app_id, start_file_id, widget_locale, type, encoding)"
     INS_ALL_WIDGET_DEFPREF="insert into WidgetDefaultPreference(app_id, key_name, key_value, readonly)"
-    INS_ALL_WIDGET_PREF="insert into WidgetPreference(tizen_appid, key_name, key_value, readonly)"
+    INS_ALL_WIDGET_PREF="insert into WidgetPreference(app_id, tizen_appid, key_name, key_value, readonly)"
     INS_ALL_WIDGET_FEATURE="insert into WidgetFeature(widget_feature_id, app_id, name,  rejected)"
     INS_ALL_WIDGET_WINMODES="insert into WidgetWindowModes(app_id, window_mode)"
     INS_ALL_WIDGET_WARP="insert into WidgetWARPInfo(app_id, iri, subdomain_access)"
@@ -104,11 +104,11 @@ if [ "x$1" == "xstart" ]; then
     sqlite3 $WRT_DB "${INS_ALL_WIDGET_LOC_STARTFILE} VALUES(2003, 4, 'en', '', '')";
 
     #widget properties
-    sqlite3 $WRT_DB "${INS_ALL_WIDGET_PREF} VALUES('tid2000', 'key1_for_2000', 'value_for_key1_2000', 0)";
-    sqlite3 $WRT_DB "${INS_ALL_WIDGET_PREF} VALUES('tid2000', 'key2_for_2000', 'value_for_key2_2000', 0)";
-    sqlite3 $WRT_DB "${INS_ALL_WIDGET_PREF} VALUES('tid2001', 'key1_for_2001', 'value1_for_key_2001', 1)";
-    sqlite3 $WRT_DB "${INS_ALL_WIDGET_PREF} VALUES('tid2002', 'key1_for_2002', 'value1_for_key_2002', 0)";
-    sqlite3 $WRT_DB "${INS_ALL_WIDGET_PREF} VALUES('tid2002', 'key2_for_2002', 'value2_for_key_2002', 1)";
+    sqlite3 $WRT_DB "${INS_ALL_WIDGET_PREF} VALUES(2000, 'tid2000', 'key1_for_2000', 'value_for_key1_2000', 0)";
+    sqlite3 $WRT_DB "${INS_ALL_WIDGET_PREF} VALUES(2000, 'tid2000', 'key2_for_2000', 'value_for_key2_2000', 0)";
+    sqlite3 $WRT_DB "${INS_ALL_WIDGET_PREF} VALUES(2001, 'tid2001', 'key1_for_2001', 'value1_for_key_2001', 1)";
+    sqlite3 $WRT_DB "${INS_ALL_WIDGET_PREF} VALUES(2002, 'tid2002', 'key1_for_2002', 'value1_for_key_2002', 0)";
+    sqlite3 $WRT_DB "${INS_ALL_WIDGET_PREF} VALUES(2002, 'tid2002', 'key2_for_2002', 'value2_for_key_2002', 1)";
 
 
     exit $?
-- 
2.7.4