Change the variable name

according to the change of https://review.tizen.org/gerrit/#/c/168181/
should change the varable name to 'ss_class'

Change-Id: Iadce9fa8954b13a392157fd1f3ed6f37c292d8ef

diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec
index c721c65c1b6a37b4fbb5141c95f7867d7e97dc83..004cf7f9d9bd974a0628f2dee0e2cfb26d0a3f79 100644 (file)
--- a/packaging/tel-plugin-dbus_tapi.spec
+++ b/packaging/tel-plugin-dbus_tapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 95
+%define patchlevel 96
 
 Name:           tel-plugin-dbus_tapi
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/dtapi_ss.c b/src/dtapi_ss.c
index 62b7b57d8fe781fc52b8395740c381b5cc777ef5..ef3e6ecebee963d90576a8ae47750230af398611 100644 (file)
--- a/src/dtapi_ss.c
+++ b/src/dtapi_ss.c
@@ -144,7 +144,7 @@ static gboolean on_ss_activate_barring(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_barring));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
        req.mode = barring_mode;
 
        memcpy(req.password, barring_password, MAX_SS_BARRING_PASSWORD_LEN);
@@ -152,7 +152,7 @@ static gboolean on_ss_activate_barring(TelephonySs *ss,
        memcpy(buf, barring_password, MAX_SS_BARRING_PASSWORD_LEN);
        buf[MAX_SS_BARRING_PASSWORD_LEN] = '\0';
        dbg("Class: [%d] Barring - mode: [%d] password: [%s]",
-               req.class, req.mode, buf);
+               req.ss_class, req.mode, buf);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -174,7 +174,7 @@ static gboolean on_ss_deactivate_barring(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_barring));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
        req.mode = barring_mode;
 
        memcpy(req.password, barring_password, MAX_SS_BARRING_PASSWORD_LEN);
@@ -182,7 +182,7 @@ static gboolean on_ss_deactivate_barring(TelephonySs *ss,
        memcpy(buf, barring_password, MAX_SS_BARRING_PASSWORD_LEN);
        buf[MAX_SS_BARRING_PASSWORD_LEN] = '\0';
        dbg("Class: [%d] Barring - mode: [%d] password: [%s]",
-               req.class, req.mode, buf);
+               req.ss_class, req.mode, buf);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -226,10 +226,10 @@ static gboolean on_ss_get_barring_status(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_barring));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
        req.mode = barring_mode;
 
-       dbg("Class: [%d] Barring mode: [%d]", req.class, req.mode);
+       dbg("Class: [%d] Barring mode: [%d]", req.ss_class, req.mode);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -252,7 +252,7 @@ static gboolean on_ss_register_forwarding(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_forwarding));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
        req.mode = forward_mode;
        req.time = forward_no_reply_time;
        req.ton  = forward_ton;
@@ -262,7 +262,7 @@ static gboolean on_ss_register_forwarding(TelephonySs *ss,
                g_strlcpy(req.number, forward_number, MAX_SS_FORWARDING_NUMBER_LEN);
 
        dbg("Class: [%d] Forwarding - mode: [%d] time: [%d] number: [%s]",
-               req.class, req.mode, req.time, req.number);
+               req.ss_class, req.mode, req.time, req.number);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -285,7 +285,7 @@ static gboolean on_ss_deregister_forwarding(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_forwarding));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
        req.mode = forward_mode;
        req.time = forward_no_reply_time;
        req.ton = forward_ton;
@@ -294,7 +294,7 @@ static gboolean on_ss_deregister_forwarding(TelephonySs *ss,
                g_strlcpy(req.number, forward_number, MAX_SS_FORWARDING_NUMBER_LEN);
 
        dbg("Class: [%d] Forwarding - mode: [%d] time: [%d] number: [%s]",
-               req.class, req.mode, req.time, req.number);
+               req.ss_class, req.mode, req.time, req.number);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -317,7 +317,7 @@ static gboolean on_ss_activate_forwarding(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_forwarding));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
        req.mode = forward_mode;
        req.time = forward_no_reply_time;
        req.ton = forward_ton;
@@ -326,7 +326,7 @@ static gboolean on_ss_activate_forwarding(TelephonySs *ss,
                g_strlcpy(req.number, forward_number, MAX_SS_FORWARDING_NUMBER_LEN);
 
        dbg("Class: [%d] Forwarding - mode: [%d] time: [%d] number: [%s]",
-               req.class, req.mode, req.time, req.number);
+               req.ss_class, req.mode, req.time, req.number);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -349,7 +349,7 @@ static gboolean on_ss_deactivate_forwarding(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_forwarding));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
        req.mode = forward_mode;
        req.time = forward_no_reply_time;
        req.ton = forward_ton;
@@ -358,7 +358,7 @@ static gboolean on_ss_deactivate_forwarding(TelephonySs *ss,
                g_strlcpy(req.number, forward_number, MAX_SS_FORWARDING_NUMBER_LEN);
 
        dbg("Class: [%d] Forwarding - mode: [%d] time: [%d] number: [%s]",
-               req.class, req.mode, req.time, req.number);
+               req.ss_class, req.mode, req.time, req.number);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -379,10 +379,10 @@ static gboolean on_ss_get_forwarding_status(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_forwarding));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
        req.mode = forward_mode;
 
-       dbg("Class: [%d] Forwarding mode: [%d]", req.class, req.mode);
+       dbg("Class: [%d] Forwarding mode: [%d]", req.ss_class, req.mode);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -401,9 +401,9 @@ static gboolean on_ss_activate_waiting(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_waiting));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
 
-       dbg("Class: [%d]", req.class);
+       dbg("Class: [%d]", req.ss_class);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -422,9 +422,9 @@ static gboolean on_ss_deactivate_waiting(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_waiting));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
 
-       dbg("Class: [%d]", req.class);
+       dbg("Class: [%d]", req.ss_class);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -443,9 +443,9 @@ static gboolean on_ss_get_waiting_status(TelephonySs *ss,
 
        memset(&req, 0x0, sizeof(struct treq_ss_waiting));
 
-       req.class = ss_class;
+       req.ss_class = ss_class;
 
-       dbg("Class: [%d]", req.class);
+       dbg("Class: [%d]", req.ss_class);
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, ss, invocation,
@@ -630,7 +630,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_add(&b, "{sv}", "barring_mode",
@@ -654,7 +654,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_add(&b, "{sv}", "barring_mode",
@@ -689,7 +689,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_add(&b, "{sv}", "barring_mode",
@@ -713,7 +713,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_add(&b, "{sv}", "forwarding_mode",
@@ -747,7 +747,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_add(&b, "{sv}", "forwarding_mode",
@@ -781,7 +781,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_add(&b, "{sv}", "forwarding_mode",
@@ -815,7 +815,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_add(&b, "{sv}", "forwarding_mode",
@@ -849,7 +849,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_add(&b, "{sv}", "forwarding_mode",
@@ -883,7 +883,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_close(&b);
@@ -905,7 +905,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_close(&b);
@@ -927,7 +927,7 @@ gboolean dbus_plugin_ss_response(struct custom_data *ctx,
                for (i = 0; i < resp->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(resp->record[i].class));
+                               g_variant_new_int32(resp->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(resp->record[i].status));
                        g_variant_builder_close(&b);
@@ -1043,7 +1043,7 @@ gboolean dbus_plugin_ss_notification(struct custom_data *ctx,
                for (i = 0; i < fwrd->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(fwrd->record[i].class));
+                               g_variant_new_int32(fwrd->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(fwrd->record[i].status));
                        g_variant_builder_add(&b, "{sv}", "forwarding_mode",
@@ -1075,7 +1075,7 @@ gboolean dbus_plugin_ss_notification(struct custom_data *ctx,
                for (i = 0; i < barr->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(barr->record[i].class));
+                               g_variant_new_int32(barr->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(barr->record[i].status));
                        g_variant_builder_add(&b, "{sv}", "barring_mode",
@@ -1097,7 +1097,7 @@ gboolean dbus_plugin_ss_notification(struct custom_data *ctx,
                for (i = 0; i < wait->record_num; i++) {
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "ss_class",
-                               g_variant_new_int32(wait->record[i].class));
+                               g_variant_new_int32(wait->record[i].ss_class));
                        g_variant_builder_add(&b, "{sv}", "ss_status",
                                g_variant_new_int32(wait->record[i].status));
                        g_variant_builder_close(&b);