Use cp_name to set the user request

diff --git a/src/sat_manager.c b/src/sat_manager.c
index 8af033b71f36a5461bf0901888bf8805ba8888c7..3ecc6e0bd6bdf194c0b23133f7ff01a20bddf655 100644 (file)
--- a/src/sat_manager.c
+++ b/src/sat_manager.c
@@ -353,7 +353,7 @@ static TReturn sat_manager_send_terminal_response(Communicator *comm, TcorePlugi
        TReturn rv = TCORE_RETURN_SUCCESS;
        UserRequest *ur = NULL;
 
-       ur = tcore_user_request_new(comm, tcore_plugin_get_description(target_plg)->name);
+       ur = tcore_user_request_new(comm, tcore_server_get_cp_name_by_plugin(target_plg));
        if (!ur) {
                dbg("ur is NULL");
                return TCORE_RETURN_FAILURE;

diff --git a/src/sms.c b/src/sms.c
index 65c4d1cf16c18b5b08111dc2adfbffe387326855..22ed1ee8850665bc87ec6481aa110de7a04aa1fe 100644 (file)
--- a/src/sms.c
+++ b/src/sms.c
@@ -1032,7 +1032,7 @@ gboolean dbus_plugin_sms_notification(struct custom_data *ctx, const char *plugi
                        gchar *sca = NULL;
                        gchar *tpdu = NULL;                     
 
-                       sca = g_base64_encode((const guchar *)&(noti->msgInfo.sca[0]), TAPI_SMS_ENCODED_SCA_LEN_MAX);
+                       sca = g_base64_encode((const guchar *)&(noti->msgInfo.sca[0]), SMS_ENCODED_SCA_LEN_MAX);
                        if (sca == NULL) {
                                dbg("g_base64_encode: Failed to Enocde msgInfo.sca");
                                sca = "";