summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChangseok Oh <seok.oh@samsung.com>2013-04-11 20:08:36 +0900
committerGerrit Code Review <gerrit2@kim11>2013-04-11 20:08:36 +0900
commitf4a1151b18f7812080c65d29213014e209a9dc06 (patch)
treecbbba2b517ffdbe2e676ecc42d5776cc039dba8d
parentcc71423121b14e9a86c93b3a0b7f191049cb1dd6 (diff)
downloadmsg-service-f4a1151b18f7812080c65d29213014e209a9dc06.tar.gz
msg-service-f4a1151b18f7812080c65d29213014e209a9dc06.tar.bz2
msg-service-f4a1151b18f7812080c65d29213014e209a9dc06.zip
Revert "Check VCONFKEY_TELEPHONY_TAPI_STATE to be sure DBus interfaces are ready"
This reverts commit cc71423121b14e9a86c93b3a0b7f191049cb1dd6
-rwxr-xr-xplugin/sms_plugin/SmsPluginMain.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugin/sms_plugin/SmsPluginMain.cpp b/plugin/sms_plugin/SmsPluginMain.cpp
index 8b38f63..059a2c9 100755
--- a/plugin/sms_plugin/SmsPluginMain.cpp
+++ b/plugin/sms_plugin/SmsPluginMain.cpp
@@ -51,12 +51,12 @@ static void MsgTapiInitCB(keynode_t *key, void* data)
{
MSG_DEBUG("MsgTapiInitCB is called.");
- int tapi_state;
- tapi_state = vconf_keynode_get_int(key);
+ bool bTelRdy = false;
+ bTelRdy = vconf_keynode_get_bool(key);
- MSG_DEBUG("tapi_state [%d]", tapi_state);
+ MSG_DEBUG("bTelRdy [%d]", bTelRdy);
- if (tapi_state == VCONFKEY_TELEPHONY_TAPI_STATE_READY) {
+ if (bTelRdy) {
mx.lock();
cv.signal();
mx.unlock();
@@ -119,14 +119,14 @@ msg_error_t SmsPlgInitialize()
if (MsgSettingSetInt(MSG_SIM_CHANGED, MSG_SIM_STATUS_NOT_FOUND) != MSG_SUCCESS)
MSG_DEBUG("MsgSettingSetInt is failed!!");
- int tapi_state;
- tapi_state = MsgSettingGetInt(VCONFKEY_TELEPHONY_TAPI_STATE);
- MSG_DEBUG("Get VCONFKEY_TELEPHONY_TAPI_STATE [%d].", tapi_state);
+ bool bReady = false;
+ MsgSettingGetBool(VCONFKEY_TELEPHONY_READY, &bReady);
+ MSG_DEBUG("Get VCONFKEY_TELEPHONY_READY [%d].", bReady);
int ret = 0;
- if(tapi_state != VCONFKEY_TELEPHONY_TAPI_STATE_READY) {
- MsgSettingRegVconfCBCommon(VCONFKEY_TELEPHONY_TAPI_STATE, MsgTapiInitCB);
+ if(!bReady) {
+ MsgSettingRegVconfCBCommon(VCONFKEY_TELEPHONY_READY, MsgTapiInitCB);
mx.lock();
ret = cv.timedwait(mx.pMutex(), 90);
mx.unlock();