s_phonebook: Fix phonebook crash

[platform/core/telephony/tel-plugin-imc.git] / src / s_sat.c

diff --git a/src/s_sat.c b/src/s_sat.c
index ebacea0..a38d999 100644 (file)
--- a/src/s_sat.c
+++ b/src/s_sat.c
@@ -221,7 +221,7 @@ static gboolean on_event_sat_proactive_command(CoreObject *o, const void *event_
                dbg("wrong input");
                break;
        }
-       if ((decoded_data.cmd_type == SAT_PROATV_CMD_REFRESH) || (decoded_data.cmd_type == SAT_PROATV_CMD_SETUP_EVENT_LIST)) {
+       if (decoded_data.cmd_type == SAT_PROATV_CMD_REFRESH) {
                /*Not supported*/
                dbg("Not suported Proactive command");
                return FALSE;
@@ -355,8 +355,8 @@ static TReturn s_envelope(CoreObject *o, UserRequest *ur)
                return TCORE_RETURN_EINVAL;
        }
        for (count = 0; count < envelope_cmd_len; count++) {
-               dbg("envelope_cmd %02x", envelope_cmd[count]);
-               sprintf(pbuffer, "%02x", envelope_cmd[count]);
+               dbg("envelope_cmd %02x", (unsigned char)envelope_cmd[count]);
+               sprintf(pbuffer, "%02x", (unsigned char)envelope_cmd[count]);
                pbuffer += 2;
        }
        dbg("pbuffer %s", envelope_cmdhex);
@@ -446,30 +446,22 @@ static struct tcore_sat_operations sat_ops = {
        .terminal_response = s_terminal_response,
 };
 
-gboolean s_sat_init(TcorePlugin *p, TcoreHal *h)
+gboolean s_sat_init(TcorePlugin *cp, CoreObject *co_sat)
 {
-       CoreObject *o = NULL;
-
        dbg("Entry");
-       o = tcore_sat_new(p, "sat", &sat_ops, h);
-       if (!o) {
-               dbg("CoreObject NULL !!");
-               return FALSE;
-       }
 
-       tcore_object_add_callback(o, "+SATI", on_event_sat_proactive_command, NULL);
-       tcore_object_add_callback(o, "+SATN", on_event_sat_proactive_command, NULL);
-       tcore_object_add_callback(o, "+SATF", on_response_terminal_response_confirm, NULL);
+       tcore_sat_override_ops(co_sat, &sat_ops);
+
+       tcore_object_override_callback(co_sat, "+SATI", on_event_sat_proactive_command, NULL);
+       tcore_object_override_callback(co_sat, "+SATN", on_event_sat_proactive_command, NULL);
+       tcore_object_override_callback(co_sat, "+SATF", on_response_terminal_response_confirm, NULL);
 
        dbg("Exit");
+
        return TRUE;
 }
 
-void s_sat_exit(TcorePlugin *p)
+void s_sat_exit(TcorePlugin *cp, CoreObject *co_sat)
 {
-       CoreObject *o = NULL;
-       o = tcore_plugin_ref_core_object(p, "sat");
-       if (!o)
-               return;
-       tcore_sat_free(o);
+       dbg("Exit");
 }