Fix to use STMS strings

Change-Id: I6c6bcd4db6b3ac8b7965756f955cacdec409ab97
Signed-off-by: Hyunwoo Kim <hwlove.kim@samsung.com>

diff --git a/client/src/privacy_manager_client.cpp b/client/src/privacy_manager_client.cpp
index 3670b867ae2befb018b0a85450f67a700946eb50..2703e190f71c387c59aa81b6f277d61ae61bfdec 100644 (file)
--- a/client/src/privacy_manager_client.cpp
+++ b/client/src/privacy_manager_client.cpp
@@ -48,7 +48,7 @@ int create_privacy_info_client_s(const char* privacy_id, bool enabled, privacy_i
 int privacy_manager_client_install_privacy(const char *package_id, const char** privacy_list, bool privacy_popup_required)\r
 {\r
        PrivacyManagerClient* pInst = PrivacyManagerClient::getInstance();\r
-       std::list < std::string > privacyList; \r
+       std::list < std::string > privacyList;\r
 \r
        while (*privacy_list[0] != '\0')\r
                privacyList.push_back(std::string(*privacy_list++));\r

diff --git a/common/src/PrivacyIdInfo.cpp b/common/src/PrivacyIdInfo.cpp
index 1168a8798b32c6653271a1072f243eb51594eec8..98dc54ee96ce0a43e232ebfceb77a6104c102ee1 100644 (file)
--- a/common/src/PrivacyIdInfo.cpp
+++ b/common/src/PrivacyIdInfo.cpp
@@ -138,7 +138,7 @@ PrivacyIdInfo::getPrivaycDisplayName(const std::string privacyId, std::string& d
                if (pNameId == NULL)\r
                        displayName = privacyId;\r
                else\r
-                       displayName = std::string(dgettext("privacy-manager", pNameId));\r
+                       displayName = std::string(dgettext(pModuleId, pNameId));\r
 \r
                LOGD("name : %s", displayName.c_str());\r
        }\r
@@ -191,4 +191,4 @@ PrivacyIdInfo::getPrivaycDescription(const std::string privacyId, std::string& d
        LOGI("leave %d", res);\r
 \r
        return PRIV_MGR_ERROR_SUCCESS;\r
-}
\ No newline at end of file
+}\r

diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec
index 63280b2ffabcea21e155e686ee20a5535b80cbac..77de1c861415b2eca0c235714c0a75f9ef3725e1 100755 (executable)
--- a/packaging/privacy-manager.spec
+++ b/packaging/privacy-manager.spec
@@ -1,7 +1,7 @@
 Name:    privacy-manager-server
 Summary: Privacy Management
 Version: 0.0.3
-Release: 1
+Release: 4
 Group:   System/Libraries
 License: SAMSUNG
 Source0: %{name}-%{version}.tar.gz

diff --git a/pkgmgr_plugin/privileges.cpp b/pkgmgr_plugin/privileges.cpp
index 8f6cd6f5e7b3e92da33c80fb9503078a80afe7be..c325b511a05c3f6a749168bf8b1c7f4ca4e570bd 100644 (file)
--- a/pkgmgr_plugin/privileges.cpp
+++ b/pkgmgr_plugin/privileges.cpp
@@ -73,6 +73,7 @@ int PKGMGR_PARSER_PLUGIN_INSTALL(xmlDocPtr docPtr, const char* packageId)
                        }
             if (strncmp(reinterpret_cast<char*>(pPrivilege), TEST_AUTOMATION_PRIVILEGE, strlen(TEST_AUTOMATION_PRIVILEGE) ) == 0 )
             {
+               LOGD("No privacy popup");
                 privacyPopupRequired = false;
             }
             else 

diff --git a/res/opt/dbspace/.privacylist.db b/res/opt/dbspace/.privacylist.db
index 655e012c2028e3f8cc580aac18876b7d12e54819..f4b9e41b41cf421fc720c24668b709891ff1dacd 100644 (file)
Binary files a/res/opt/dbspace/.privacylist.db and b/res/opt/dbspace/.privacylist.db differ