Rename E_PRIVIL to E_ACCESS

Permission denial may occur by other reasons.

Change-Id: I0b6c89000be9c01c9ded0e428f6cfe47cffc8b1a
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/include/ContextTypes.h b/include/ContextTypes.h
index 17b07d6..7a861f6 100644 (file)
--- a/include/ContextTypes.h
+++ b/include/ContextTypes.h
@@ -34,7 +34,7 @@
 #define E_PARAM                TIZEN_ERROR_INVALID_PARAMETER   /* Invalid function parameter */
 #define E_INV_OP       TIZEN_ERROR_INVALID_OPERATION   /* Function not implemented */
 #define E_NO_MEM       TIZEN_ERROR_OUT_OF_MEMORY               /* Memory allocation failed */
-#define E_PRIVIL       TIZEN_ERROR_PERMISSION_DENIED   /* Privileged denied */
+#define E_ACCESS       TIZEN_ERROR_PERMISSION_DENIED   /* Permission denied */
 #define E_SUPPORT      TIZEN_ERROR_NOT_SUPPORTED               /* Feature not supported */
 #define E_NO_DATA      TIZEN_ERROR_NO_DATA                             /* No data available */
 

diff --git a/src/client/ServiceProxy.cpp b/src/client/ServiceProxy.cpp
index e10e9fc..7dd4dcc 100644 (file)
--- a/src/client/ServiceProxy.cpp
+++ b/src/client/ServiceProxy.cpp
@@ -33,6 +33,9 @@ ServiceProxy::ServiceProxy(const char* serviceName) :
        __interface(CTX_DBUS_IFACE),
        __connection(NULL)
 {
+       // Initializing the error domain
+       CTX_ERROR_DOMAIN;
+
        __objPath += serviceName;
        __interface += serviceName;
 
@@ -91,7 +94,7 @@ int ServiceProxy::call(const std::string& methodName, GVariant* inParam, GVarian
        int ret = E_FAILED;
 
        if (gerr->domain == G_DBUS_ERROR && gerr->code == G_DBUS_ERROR_ACCESS_DENIED) {
-               ret = E_PRIVIL;
+               ret = E_ACCESS;
        } else if (gerr->domain == CTX_ERROR_DOMAIN) {
                ret = gerr->code;
        }
@@ -187,7 +190,7 @@ void ServiceProxy::__onError(const std::string& methodName, GError* gerr, IServi
        int error = E_FAILED;
 
        if (gerr->domain == G_DBUS_ERROR && gerr->code == G_DBUS_ERROR_ACCESS_DENIED) {
-               error = E_PRIVIL;
+               error = E_ACCESS;
        } else if (gerr->domain == CTX_ERROR_DOMAIN) {
                error = gerr->code;
        }

diff --git a/src/shared/ContextErrorUtil.cpp b/src/shared/ContextErrorUtil.cpp
index 8b1def9..f1d428b 100644 (file)
--- a/src/shared/ContextErrorUtil.cpp
+++ b/src/shared/ContextErrorUtil.cpp
@@ -23,7 +23,7 @@ static const GDBusErrorEntry __ctxErrorEntries[] =
        {E_PARAM,       ERROR_PREFIX "Param"},
        {E_INV_OP,      ERROR_PREFIX "InvOp"},
        {E_NO_MEM,      ERROR_PREFIX "NoMem"},
-       {E_PRIVIL,      ERROR_PREFIX "Privilege"},
+       {E_ACCESS,      ERROR_PREFIX "Access"},
        {E_SUPPORT,     ERROR_PREFIX "Support"},
        {E_NO_DATA,     ERROR_PREFIX "NoData"},
        {E_STARTED,     ERROR_PREFIX "Started"},