--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcalldivertingwrapper.cpp	Fri Jun 04 10:19:18 2010 +0100
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcalldivertingwrapper.cpp	Wed Jun 23 18:12:20 2010 +0300
@@ -88,15 +88,10 @@
 void PSetCallDivertingWrapper::getDefaultNumbers( 
         QStringList & aDefNumbers )
     {
-    static int i =0;
-    if(i == 0){
-        QStringList list;
-        list << "0401234567" << "0501234567" << "0451234567";
-        aDefNumbers = list;
-        i=1;
-    }else{
-        i=0;
-    }
+    QStringList list;
+    list << "0401234567" << "0501234567" << "0451234567";
+    aDefNumbers = list;
+    
     SMC_MOCK_METHOD1( void, QStringList &, aDefNumbers )
     }
 
@@ -115,7 +110,18 @@
 // PSetCallDivertingWrapper::getVoiceMailBoxNumber
 // -----------------------------------------------------------------------------
 //
-void PSetCallDivertingWrapper::getVoiceMailBoxNumber(QString &number)
-{
-    SMC_MOCK_METHOD1( void, QString&, number )
-}
\ No newline at end of file
+int PSetCallDivertingWrapper::getVoiceMailBoxNumber(
+        QString &aNumber, PsService aService)
+    {
+    SMC_MOCK_METHOD2( int, QString & , aNumber, PsService, aService )
+    }
+
+// -----------------------------------------------------------------------------
+// PSetCallDivertingWrapper::queryVoiceMailBoxNumber
+// -----------------------------------------------------------------------------
+//
+int PSetCallDivertingWrapper::queryVoiceMailBoxNumber(
+        QString &aNumber, PsService aService)
+    {
+    SMC_MOCK_METHOD2( int, QString & , aNumber, PsService, aService )
+    }