From 3c8c0a079bd53d0b9b8e1fd5ef8659bb3034fb45 Mon Sep 17 00:00:00 2001
From: Hyunwoo Kim <hwlove.kim@samsung.com>
Date: Wed, 15 May 2013 14:09:16 +0900
Subject: [PATCH] Fix to use STMS strings

Change-Id: I6c6bcd4db6b3ac8b7965756f955cacdec409ab97
Signed-off-by: Hyunwoo Kim <hwlove.kim@samsung.com>
---
 client/src/privacy_manager_client.cpp |   2 +-
 common/src/PrivacyIdInfo.cpp          |   4 ++--
 packaging/privacy-manager.spec        |   2 +-
 pkgmgr_plugin/privileges.cpp          |   1 +
 res/opt/dbspace/.privacylist.db       | Bin 10240 -> 10240 bytes
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/src/privacy_manager_client.cpp b/client/src/privacy_manager_client.cpp
index 3670b86..2703e19 100644
--- 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)
 {
 	PrivacyManagerClient* pInst = PrivacyManagerClient::getInstance();
-	std::list < std::string > privacyList; 
+	std::list < std::string > privacyList;
 
 	while (*privacy_list[0] != '\0')
 		privacyList.push_back(std::string(*privacy_list++));
diff --git a/common/src/PrivacyIdInfo.cpp b/common/src/PrivacyIdInfo.cpp
index 1168a87..98dc54e 100644
--- 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)
 			displayName = privacyId;
 		else
-			displayName = std::string(dgettext("privacy-manager", pNameId));
+			displayName = std::string(dgettext(pModuleId, pNameId));
 
 		LOGD("name : %s", displayName.c_str());
 	}
@@ -191,4 +191,4 @@ PrivacyIdInfo::getPrivaycDescription(const std::string privacyId, std::string& d
 	LOGI("leave %d", res);
 
 	return PRIV_MGR_ERROR_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec
index 63280b2..77de1c8 100755
--- 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 8f6cd6f..c325b51 100644
--- 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
GIT binary patch
delta 467
zcmZn&Xb6}f&8Rq0#+gxZW5PmaNyb$S9E?d!O#7Hhfs_{WQN~BiWz2?5r4t(;u>d90
zCN_o%0cjovC~#wD^%eG<tjI1k*-x5XHNUvP(<L}QB*4cp#LYj*H{L%WB;MKIFT~L~
zBskvD$%&br!D3>g37Z=SRG*?cRy~f+&i<i(5Ivr(tbxMbU^^1HIW@4V_jL^pc69gj
za|c=C&cx~ub<_uT4(t{<JNmf#xi|)a)VneQEpP@|pqrFanp%>dUy^~<7AK!j*ARdI
z5D&2LwI((y@c4n4p3YoA8y&$;yuikxj8(Ibzq4bAr@x;sCu^{9AXx1gE-r1XYQsI_
k-8|!6JcC@FLqIOHWMg#|HV5gE&Pz+is>RREc@c*K0G!T%WB>pF

delta 257
zcmZn&Xb6}f%_uuj#+gxeW5PmaNv2W;4kl*?CTHdg%nO<7n7x>#nVvFjU@G0L$f3!^
zX28fA$RI!2fK6)hJvL4Wr<~H%lKlLV4CVp`P6iM#V1+7B=J!o4E>29(%u6@sV)bWG
z2Wyg-<q!@nPAyW%$xlu!$;{6);baYFPzB4K;o=es&(w9xRB*{GN=+`&<zV$?kOfJJ
zCMGB6m*$l?La1UDHda>#VUP@0URtuBn={a2!-<W$Y`V-aEtCDE+4-FF^GXtvON#ZF
ZfDQngH2DHI2ZwWFPHJ9CV$mWF1pwFYK(hb<

-- 
2.7.4