diff -r 427125ac6cb8 -r 7eb70891911c telutils/dialpad/src/dialpadsymbianwrapper_p.cpp --- a/telutils/dialpad/src/dialpadsymbianwrapper_p.cpp Thu May 27 13:23:05 2010 +0300 +++ b/telutils/dialpad/src/dialpadsymbianwrapper_p.cpp Fri Jun 11 14:07:16 2010 +0300 @@ -38,8 +38,11 @@ int errValue(KErrNone); CVoiceMailboxEntry* vmbxEntry = NULL; TVoiceMailboxParams vmbxParams; + vmbxParams.iType = EVmbxVoice; + + errValue = mVmbx->GetStoredEntry(vmbxParams, vmbxEntry); - if (KErrNone == mVmbx->GetStoredEntry(vmbxParams, vmbxEntry)) { + if (KErrNone == errValue) { // Number retrieved succesfully: vmbxNumber = getVmbxNumber(*vmbxEntry); } @@ -56,7 +59,9 @@ TVoiceMailboxParams vmbxParams; vmbxParams.iType = EVmbxVideo; - if (KErrNone == mVmbx->GetStoredEntry(vmbxParams, vmbxEntry)) { + errValue = mVmbx->GetStoredEntry(vmbxParams, vmbxEntry); + + if (KErrNone == errValue) { // Number retrieved succesfully: vmbxNumber = getVmbxNumber(*vmbxEntry); } @@ -70,16 +75,15 @@ { CVoiceMailboxEntry* vmbxEntry = NULL; TVoiceMailboxParams vmbxParams; - int errValue = mVmbx->QueryVmbxType( vmbxParams ); - - if ((KErrNotFound == errValue)) { - errValue = mVmbx->QueryNewEntry(vmbxParams, vmbxEntry); - if (KErrNone == errValue) { - mVmbx->SaveEntry(*vmbxEntry); - // Do appropriate tasks, e.g. save number. - vmbxNumber = getVmbxNumber(*vmbxEntry); - } + vmbxParams.iType = EVmbxVoice; + + int errValue = mVmbx->QueryNewEntry(vmbxParams, vmbxEntry); + if (KErrNone == errValue) { + mVmbx->SaveEntry(*vmbxEntry); + // Do appropriate tasks, e.g. save number. + vmbxNumber = getVmbxNumber(*vmbxEntry); } + return errValue; } @@ -88,16 +92,14 @@ CVoiceMailboxEntry* vmbxEntry = NULL; TVoiceMailboxParams vmbxParams; vmbxParams.iType = EVmbxVideo; - int errValue = mVmbx->QueryVmbxType( vmbxParams ); - - if ((KErrNotFound == errValue)) { - errValue = mVmbx->QueryNewEntry(vmbxParams, vmbxEntry); - if (KErrNone == errValue) { - mVmbx->SaveEntry(*vmbxEntry); - // Do appropriate tasks, e.g. save number. - vmbxNumber = getVmbxNumber(*vmbxEntry); - } + + int errValue = mVmbx->QueryNewEntry(vmbxParams, vmbxEntry); + if (KErrNone == errValue) { + mVmbx->SaveEntry(*vmbxEntry); + // Do appropriate tasks, e.g. save number. + vmbxNumber = getVmbxNumber(*vmbxEntry); } + return errValue; }