summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyunwoo Kim <hwlove.kim@samsung.com>2013-05-15 14:09:16 +0900
committerHyunwoo Kim <hwlove.kim@samsung.com>2013-05-15 14:09:22 +0900
commit3c8c0a079bd53d0b9b8e1fd5ef8659bb3034fb45 (patch)
tree0de718d4471447df5671d43f4f8c2f1d1817ba36
parent2a5ab277a3e622a64eaccc1b855776377b8fbc66 (diff)
downloadprivacy-manager-3c8c0a079bd53d0b9b8e1fd5ef8659bb3034fb45.tar.gz
privacy-manager-3c8c0a079bd53d0b9b8e1fd5ef8659bb3034fb45.tar.bz2
privacy-manager-3c8c0a079bd53d0b9b8e1fd5ef8659bb3034fb45.zip
Fix to use STMS strings
Change-Id: I6c6bcd4db6b3ac8b7965756f955cacdec409ab97 Signed-off-by: Hyunwoo Kim <hwlove.kim@samsung.com>
-rw-r--r--client/src/privacy_manager_client.cpp2
-rw-r--r--common/src/PrivacyIdInfo.cpp4
-rwxr-xr-xpackaging/privacy-manager.spec2
-rw-r--r--pkgmgr_plugin/privileges.cpp1
-rw-r--r--res/opt/dbspace/.privacylist.dbbin10240 -> 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 655e012..f4b9e41 100644
--- a/res/opt/dbspace/.privacylist.db
+++ b/res/opt/dbspace/.privacylist.db
Binary files differ