Change access denied check string

Change-Id: I751d14db85e772be33d423a5645cb818f372bc10

diff --git a/packaging/libtapi.spec b/packaging/libtapi.spec
index f4bac98d3f9f1efe7892132a1f196ca1ce06b1df..e41f3b1d9fab0637e4547c5c8b6f1e0bb9696ed0 100644 (file)
--- a/packaging/libtapi.spec
+++ b/packaging/libtapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 7
-%define patchlevel 98
+%define patchlevel 99
 
 Name:           libtapi
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/common.h b/src/common.h
index 29e55a5fa4677b5b9650b0e006056eb3277767b4..1a0a1908bc0a7280594c6ccad5f105392ebcba24 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -45,7 +45,7 @@ __BEGIN_DECLS
                                && error->domain == G_IO_ERROR) { \
                        err("Operation CANCELLED"); \
                        /* Do not invoke callback in case of deinit TapiHandle */ \
-               } else if (strstr(error->message, "No access rights")) { \
+               } else if (strstr(error->message, "AccessDenied")) { \
                        err("(%s) Access denied!", (evt_cb_data)->handle->cp_name); \
                        if ((evt_cb_data)->cb_fn) \
                                (evt_cb_data)->cb_fn((evt_cb_data)->handle, TAPI_ERROR_ACCESS_DENIED, NULL, (evt_cb_data)->user_data); \

diff --git a/src/tapi_call.c b/src/tapi_call.c
index 812ae403e04975acc7b5677345538bd522da7b63..61a3dcaad258375784a55b9e611acec5a41d4498 100644 (file)
--- a/src/tapi_call.c
+++ b/src/tapi_call.c
@@ -860,7 +860,7 @@ EXPORT_API int tel_get_call_status_all(TapiHandle *handle, TelCallStatusCallback
                if (gerr)
                        g_error_free(gerr);
        } else {
-               if (strstr(gerr->message, "No access rights")) {
+               if (strstr(gerr->message, "AccessDenied")) {
                        err("Permission denied");
                        return TAPI_API_ACCESS_DENIED;
                } else {

diff --git a/src/tapi_common.c b/src/tapi_common.c
index 56412f6d857d81585c4f6acd05e130c3efa600fa..e285a1e9e4b797b309d3849708fb79d74e2bc574 100644 (file)
--- a/src/tapi_common.c
+++ b/src/tapi_common.c
@@ -1375,7 +1375,7 @@ static char *get_property(TapiHandle *handle, const char *property,
                if (error->code == G_DBUS_ERROR_ACCESS_DENIED) {
                        warn("Access Denied");
                        g_error_free(error);
-                       return g_strdup("No access rights");
+                       return g_strdup("AccessDenied");
                } else {
                        warn("dbus error = %d (%s)", error->code, error->message);
                        g_error_free(error);
@@ -1423,7 +1423,7 @@ EXPORT_API int tel_get_property_int (TapiHandle *handle,
        data = get_property(handle, property, G_VARIANT_TYPE_INT32);
        if (!data)
                return TAPI_API_OPERATION_FAILED;
-       else if (!g_strcmp0(data, "No access rights"))
+       else if (!g_strcmp0(data, "AccessDenied"))
                return TAPI_API_ACCESS_DENIED;
 
        *result = atoi(data);
@@ -1444,7 +1444,7 @@ EXPORT_API int tel_get_property_string(TapiHandle *handle, const char *property,
        data = get_property(handle, property, G_VARIANT_TYPE_STRING);
        if (!data)
                return TAPI_API_OPERATION_FAILED;
-       else if (!g_strcmp0(data, "No access rights"))
+       else if (!g_strcmp0(data, "AccessDenied"))
                return TAPI_API_ACCESS_DENIED;
 
        *result = data;

diff --git a/src/tapi_sim.c b/src/tapi_sim.c
index 2e540cc680eae24b626434318f48552c3e3d60ef..0dcb5aeb598e8d6963bc120509232fb27f71e472 100644 (file)
--- a/src/tapi_sim.c
+++ b/src/tapi_sim.c
@@ -41,7 +41,7 @@
 #define DBUS_SIM_RESPONSE_DATA_ERROR "SIM RESPONSE DATA ERROR"
 #define DBUS_SIM_SERVICE_IS_DISABLED "SIM SERVICE IS DISABLED"
 #define DBUS_SIM_SERVICE_NOT_SUPPORTED_FOR_NVSIM "SERVICE NOT SUPPORTED FOR NVSIM"
-#define DBUS_SIM_ACCESS_DENIED "No access rights"
+#define DBUS_SIM_ACCESS_DENIED "AccessDenied"
 
 #define TAPI_PIN_TIMEOUT    (350 * 1000) /* Unlimit: G_MAXINT */