Header files unification

Change-Id: Id829b82e695af84532642a9cd46e582d22f3ff50

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2ee21d..710ab8b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(INCLUDEDIR "\${prefix}/include")
 
 # Set required packages
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED glib-2.0 tcore libtzplatform-config vconf)
+pkg_check_modules(pkgs REQUIRED glib-2.0 tcore libtzplatform-config tel-headers vconf)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/packaging/tel-plugin-atmodem.spec b/packaging/tel-plugin-atmodem.spec
index 74eaa33..84abb5e 100644 (file)
--- a/packaging/tel-plugin-atmodem.spec
+++ b/packaging/tel-plugin-atmodem.spec
@@ -16,6 +16,7 @@ BuildRequires:  cmake
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(tcore)
 BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(tel-headers)
 BuildRequires:  pkgconfig(vconf)
 
 %description

diff --git a/src/atmodem_sim.c b/src/atmodem_sim.c
index 4bff295..f8db93a 100755 (executable)
--- a/src/atmodem_sim.c
+++ b/src/atmodem_sim.c
@@ -1240,7 +1240,7 @@ static void __on_response_atmodem_sim_get_file_data(TcorePending *p,
 
                        case TEL_SIM_EF_CPHS_MAILBOX_NUMBERS:   /* linear type */
                        case TEL_SIM_EF_MBDN:                   /* linear type */
-#if 0 //TODO tcore_sim_decode_xdn was changed from libtcore. It should be changed according to libtcore
+#if 0  /* Temporarily blocked, MBDN is NOT suported in Emulator */
                                dr = tcore_sim_decode_xdn((unsigned char *)res, res_len,
                                        file_meta->mb_list[file_meta->current_index-1].alpha_id,
                                        file_meta->mb_list[file_meta->current_index-1].number);
@@ -1250,7 +1250,7 @@ static void __on_response_atmodem_sim_get_file_data(TcorePending *p,
 
                                file_meta->mb_list[file_meta->current_index-1].profile_id =
                                        file_meta->current_index;
-#endif
+#endif /* Temporarily blocked, MBDN is NOT suported in Emulator */
                        break;
 
                        case TEL_SIM_EF_CPHS_VOICE_MSG_WAITING: /* transparent type */
@@ -2678,7 +2678,7 @@ static void __on_response_atmodem_sim_read_data(TcorePending *p,
 
                        case TEL_SIM_EF_CPHS_MAILBOX_NUMBERS:   /* linear type */
                        case TEL_SIM_EF_MBDN:                   /* linear type */
-#if 0 //TODO tcore_sim_decode_xdn was changed from libtcore. It should be changed according to libtcore
+#if 0  /* Temporarily blocked, MBDN is NOT suported in Emulator */
                                dr = tcore_sim_decode_xdn((unsigned char *)res, res_len,
                                        file_meta->mb_list[file_meta->current_index-1].alpha_id,
                                        file_meta->mb_list[file_meta->current_index-1].number);
@@ -2686,7 +2686,7 @@ static void __on_response_atmodem_sim_read_data(TcorePending *p,
                                        strlen(file_meta->mb_list[file_meta->current_index-1].alpha_id);
                                file_meta->mb_list[file_meta->current_index-1].profile_id =
                                        file_meta->current_index;
-#endif
+#endif /* Temporarily blocked, MBDN is NOT suported in Emulator */
                        break;
 
                        case TEL_SIM_EF_CPHS_VOICE_MSG_WAITING: /* transparent type */