Correct some typo and add missing feature define

Change-Id: I2899425d7fed0de51e018ea2f03dcef07158751b
Signed-off-by: sinikang <sinikang@samsung.com>

diff --git a/include/ps_common.h b/include/ps_common.h
index 70e4666..98adbd5 100644 (file)
--- a/include/ps_common.h
+++ b/include/ps_common.h
@@ -296,7 +296,9 @@ typedef struct packet_service_context {
        TcorePlugin *plg;
 
        gboolean alwayson;
+#ifdef PREPAID_SIM_APN_SUPPORT
        gboolean prepaid_alwayson;
+#endif
        gboolean is_default;
        gboolean hidden;
        gboolean editable;

diff --git a/include/ps_context.h b/include/ps_context.h
index d7f5fcd..4260181 100644 (file)
--- a/include/ps_context.h
+++ b/include/ps_context.h
@@ -32,8 +32,6 @@ GVariant *    _ps_context_get_properties(ps_context_t *context, GVariantBuilder
 gboolean      _ps_context_set_service(ps_context_t *context, ps_service_t *service);
 ps_service_t *_ps_context_ref_service(ps_context_t *context);
 gboolean      _ps_context_get_alwayson_enable(ps_context_t *context);
-gboolean      _ps_context_get_prepaid_alwayson_enable(ps_context_t *context);
-int           _ps_context_get_profile_id(ps_context_t *context);
 gchar *       _ps_context_ref_path(ps_context_t *context);
 CoreObject *  _ps_context_ref_co_context(ps_context_t *context);
 gboolean      _ps_context_set_connected(ps_context_t *context, gboolean enabled);
@@ -56,12 +54,16 @@ gboolean      _ps_context_set_bearer_info(ps_context_t *context, struct tnoti_ps
 gboolean      _ps_context_check_is_roaming_apn_support(gchar *mccmnc, gchar *cp_name);
 gboolean      _ps_context_handling_nas_timer(ps_context_t *context, gboolean value);
 gboolean      _ps_context_set_default_connection_enable(ps_context_t *context, gboolean enabled);
-gboolean _ps_context_update_attach_apn(GSList *contexts, const gchar *mccmnc);
+gboolean      _ps_context_update_attach_apn(GSList *contexts, const gchar *mccmnc);
 
 #ifdef TIZEN_SUPPORT_VOLTE
-void     _ps_context_hook_deregister_ims_cb(UserRequest *ur, enum tcore_response_command command, unsigned int data_len, const void *data, void *user_data);
-gboolean _ps_context_deregister_ims_timeout(gpointer user_data);
-TReturn  _ps_context_deregister_ims(ps_context_t *context);
+void          _ps_context_hook_deregister_ims_cb(UserRequest *ur, enum tcore_response_command command, unsigned int data_len, const void *data, void *user_data);
+gboolean      _ps_context_deregister_ims_timeout(gpointer user_data);
+TReturn       _ps_context_deregister_ims(ps_context_t *context);
+#endif
+#ifdef PREPAID_SIM_APN_SUPPORT
+gboolean      _ps_context_get_prepaid_alwayson_enable(ps_context_t *context);
+int           _ps_context_get_profile_id(ps_context_t *context);
 #endif
 
 gpointer _ps_context_create_database_handle(const char *cp_name);

diff --git a/interface/src/ps_context_interface.c b/interface/src/ps_context_interface.c
index 5411ca8..b734094 100644 (file)
--- a/interface/src/ps_context_interface.c
+++ b/interface/src/ps_context_interface.c
@@ -304,7 +304,6 @@ static gboolean on_context_handle_activate(PacketServiceContext *obj_context,
        num_of_active_cids = g_slist_length(active_cids);
        max_pdn = tcore_ps_get_num_of_pdn(co_ps);
        ps_info_ex_ctx(context, "activate cids(%d), max pdn(%d)", num_of_active_cids, max_pdn);
-
        if (num_of_active_cids < max_pdn) {
                ps_dbg_ex_ctx(context, "enough to active another pdn");
 
@@ -365,7 +364,7 @@ static gboolean on_context_handle_activate(PacketServiceContext *obj_context,
 
 }
 
-static gboolean on_context_handle_deactiavte(PacketServiceContext *obj_context,
+static gboolean on_context_handle_deactivate(PacketServiceContext *obj_context,
                                             GDBusMethodInvocation *invocation,
                                             gpointer user_data)
 {
@@ -804,7 +803,7 @@ gboolean ps_context_setup_interface(ps_context_t *context_data)
 
        g_signal_connect(context,
                         "handle-deactivate",
-                        G_CALLBACK(on_context_handle_deactiavte),
+                        G_CALLBACK(on_context_handle_deactivate),
                         context_data);
 
        g_signal_connect(context,

diff --git a/packaging/tel-plugin-packetservice.spec b/packaging/tel-plugin-packetservice.spec
index 2601b8d..ef61de2 100644 (file)
--- a/packaging/tel-plugin-packetservice.spec
+++ b/packaging/tel-plugin-packetservice.spec
@@ -4,7 +4,7 @@
 
 %define major 0
 %define minor 4
-%define patchlevel 27
+%define patchlevel 28
 
 Name:           tel-plugin-packetservice
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/ps_context.c b/src/ps_context.c
index d14e220..aba6882 100644 (file)
--- a/src/ps_context.c
+++ b/src/ps_context.c
@@ -2038,20 +2038,6 @@ gboolean _ps_context_get_alwayson_enable(ps_context_t *context)
        return context->alwayson;
 }
 
-gboolean _ps_context_get_prepaid_alwayson_enable(ps_context_t *context)
-{
-       g_return_val_if_fail(context != NULL, FALSE);
-       dbg("prepaid context (%p) alwayson (%d)", context, context->prepaid_alwayson);
-       return context->prepaid_alwayson;
-}
-
-int _ps_context_get_profile_id(ps_context_t *context)
-{
-       g_return_val_if_fail(context != NULL, -1);
-       dbg("profile_id[%d]", context->profile_id);
-       return context->profile_id;
-}
-
 CoreObject *_ps_context_ref_co_context(ps_context_t *context)
 {
        g_return_val_if_fail(context != NULL, NULL);
@@ -2445,3 +2431,20 @@ gboolean _ps_context_handle_ifacedown(ps_context_t *context)
        }
        return FALSE;
 }
+
+#ifdef PREPAID_SIM_APN_SUPPORT
+gboolean _ps_context_get_prepaid_alwayson_enable(ps_context_t *context)
+{
+       g_return_val_if_fail(context != NULL, FALSE);
+       dbg("prepaid context (%p) alwayson (%d)", context, context->prepaid_alwayson);
+       return context->prepaid_alwayson;
+}
+
+int _ps_context_get_profile_id(ps_context_t *context)
+{
+       g_return_val_if_fail(context != NULL, -1);
+       dbg("profile_id[%d]", context->profile_id);
+       return context->profile_id;
+}
+#endif
+

diff --git a/src/ps_hook.c b/src/ps_hook.c
index e31e4cf..1ab935f 100644 (file)
--- a/src/ps_hook.c
+++ b/src/ps_hook.c
@@ -121,7 +121,7 @@ static void __ps_send_ur_dispatch_failure_response(UserRequest *ur, enum tcore_r
 
                set_rsp.result = TCORE_RETURN_FAILURE;
                tcore_user_request_send_response(ur, TRESP_NETWORK_SET_MODE,
-                                                sizeof(struct tresp_network_search), &set_rsp);
+                                                sizeof(struct tresp_network_set_mode), &set_rsp);
        }
        break;
 

diff --git a/src/ps_service.c b/src/ps_service.c
index 99a3094..5bd3a15 100644 (file)
--- a/src/ps_service.c
+++ b/src/ps_service.c
@@ -206,7 +206,7 @@ static gboolean __ps_service_check_connection_option(ps_service_t *service, ps_c
                }
        }
 #ifdef TIZEN_SUPPORT_REQUEST_HOOK_PDP_CONTROL
-       ps_info_ex_svc(service, "b_connect(%d), power(%d), sim init(%d), data allowed(%d), flight mode(%d) restricted(%d) ps_attached(%d), ps_mode(%d), fook_flag(%d)",
+       ps_info_ex_svc(service, "b_connect(%d), power(%d), sim init(%d), data allowed(%d), flight mode(%d) restricted(%d) ps_attached(%d), ps_mode(%d), hook_flag(%d)",
                       b_connect, power, sim, data, flight, service->restricted, service->ps_attached, ps_mode, hook_flag);
 #else
        ps_info_ex_svc(service, "b_connect(%d), power(%d), sim init(%d), data allowed(%d), flight mode(%d) restricted(%d) ps_attached(%d), ps_mode(%d)",
@@ -302,7 +302,6 @@ static TReturn __ps_service_set_attach_apn(ps_service_t *service, CoreObject *co
                if (rv != TCORE_RETURN_SUCCESS)
                        ps_err_ex_svc(service, "fail to set data profile");
        } else {
-               //rv = tcore_ps_define_context(co_ps, co_context, 0, NULL);
                rv = tcore_ps_define_context(co_ps, co_context, NULL);
                if (rv != TCORE_RETURN_SUCCESS)
                        ps_err_ex_svc(service, "fail to define context");
@@ -654,7 +653,6 @@ int _ps_service_define_context(ps_service_t *service, ps_context_t *context)
        if (!b_connect)
                return TCORE_RETURN_EPERM;
 
-//     return tcore_ps_define_context(_ps_service_ref_co_ps(service), co_context, 0, NULL);
        return tcore_ps_define_context(_ps_service_ref_co_ps(service), co_context, NULL);
 }
 
@@ -716,7 +714,6 @@ int _ps_service_activate_context(ps_service_t *service, ps_context_t *context)
 
        if (!ps_defined) {
                ps_info_ex_svc(service, "pdp profile is not defined yet, define first. ");
-               //ret = tcore_ps_define_context(co_ps, co_context, manual_cid, NULL);
                ret = tcore_ps_define_context(co_ps, co_context, NULL);
        } else {
                ps_info_ex_svc(service, "pdp profile is defined, activate context. ");
@@ -1018,6 +1015,7 @@ int _ps_service_connect_default_context(ps_service_t *service)
        return rv;
 }
 
+#ifdef PREPAID_SIM_APN_SUPPORT
 gboolean _ps_service_connect_last_connected_context_ex(ps_service_t *service, ps_context_t *context,
                                                       gboolean *defined, char *operator)
 {
@@ -1151,6 +1149,7 @@ ps_context_t *_ps_service_return_context_by_cid(ps_service_t *service, int conte
        }
        return NULL;
 }
+#endif
 
 ps_context_t *_ps_service_return_default_context(ps_service_t *service, int svc_cat_id)
 {