--- a/browserutilities/browsertelservice/src/BrowserTelService.cpp	Tue Aug 31 16:17:46 2010 +0300
+++ b/browserutilities/browsertelservice/src/BrowserTelService.cpp	Wed Sep 01 12:28:30 2010 +0100
@@ -22,16 +22,16 @@
 #include    <data_caging_path_literals.hrh>
 
 // For phonebook API
-//#include <CPbkContactItem.h>    // Phonebook Contact
-//#include <CPbkContactEngine.h>  // Phonebook Engine
-//#include <CPbkFieldsInfo.h>     // Phonebook field types
-//#include <RPbkViewResourceFile.h>
-//#include <CPbkContactEditorDlg.h>   // Phonebook editor
+#include <CPbkContactItem.h>    // Phonebook Contact
+#include <CPbkContactEngine.h>  // Phonebook Engine
+#include <CPbkFieldsInfo.h>     // Phonebook field types
+#include <RPbkViewResourceFile.h>
+#include <CPbkContactEditorDlg.h>   // Phonebook editor
 // For searching a matching number from contact's db
-//#include <TPbkContactItemField.h>
-#include <cntfldst.h>
-
-#include <featmgr.h>
+#include <TPbkContactItemField.h>
+#include <CNTFLDST.H>
+
+#include <FeatMgr.h>
 // 
 #include <txtrich.h>
 #include <badesca.h>
@@ -57,7 +57,7 @@
 #include <es_enum.h>
 
 #include <ApUtils.h>
-#include <ApDataHandler.h>
+#include <APDataHandler.h>
 #include <ApAccessPointItem.h>
 #include <commdb.h>
 
@@ -65,10 +65,10 @@
 // Const file name for make call
 #include <mmtsy_names.h>
 
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #include <centralrepository.h>
 
-#include <xml/cxml/nwx_status.h>
+#include <nwx_status.h>
 
 #include <DialUtils.h>
 
@@ -80,8 +80,10 @@
 
 const TInt KParseArrayAllocation = 10;
 const TInt KTimerDelay = 2500000;
-//constants 
-const TUid KUidMsgTypeSMTP                      = {0x10001028}; // 268439592 
+
+//constants
+const TUid KUidMsgTypeSMTP			= {0x10001028};	// 268439592
+
 
 _LIT( KValidDTMFChars,"w/p*#0123456789ABCDabcd," );
 _LIT( KDTMFWaitChars, "/wp,*#" );
@@ -1074,18 +1076,12 @@
     {
     TELSERVICE_ENTERFN( "FindAndRipVoipParametersL()" )
 
-    HBufC* buf = NULL;    
     TInt offset = aNumber.Locate( TChar( '@' ) );
     if( offset > 0 ) // Separator is not allowed to be a first char
         {
-        __ASSERT_DEBUG( offset <= aNumber.Length(), User::Leave( KErrGeneral ) );
-        buf = aNumber.Mid( offset ).AllocL();         
+        __ASSERT_DEBUG( offset <= aNumber.Length(), User::Leave( KErrGeneral ) );         
         aNumber.SetLength( offset );           
         }
-    else
-        {
-        buf = HBufC::NewL( 0 );
-        }
 
     TELSERVICE_LEAVEFN( "FindAndRipVoipParametersL()" )
     }
@@ -1382,7 +1378,7 @@
     {
     TELSERVICE_ENTERFN( "AddPBEntryL()" )
 
-/*    CPbkContactEngine* pbkEngine = CPbkContactEngine::NewL();
+    CPbkContactEngine* pbkEngine = CPbkContactEngine::NewL();
     CleanupStack::PushL( pbkEngine );
 
     // Make sure a resource file is available
@@ -1481,7 +1477,7 @@
     CleanupStack::PopAndDestroy( 3 ); // contactItem, pbkResourceFile, pbkEngine
 
     TELSERVICE_LEAVEFN( "AddPBEntryL()" )
-*/
+
     return KErrNone;
 	}
 
@@ -1598,7 +1594,7 @@
            loopCounter = 1;
         }
                    
-        for(loopCounter; loopCounter<len; loopCounter++)
+        for(; loopCounter<len; loopCounter++)
         {
             if( (*ptr >= '0' && *ptr <= '9') || *ptr == ',')
             {
@@ -2353,7 +2349,7 @@
     HBufC* matchingName = NULL;
 	
     // Create phonebook engine
-/*    CPbkContactEngine* pbkEngine = CPbkContactEngine::NewL();
+    CPbkContactEngine* pbkEngine = CPbkContactEngine::NewL();
     CleanupStack::PushL( pbkEngine );
 
     // Make sure a resource file is available
@@ -2377,7 +2373,7 @@
         }
 
     CleanupStack::PopAndDestroy( 3 );   // idArray, pbkResourceFile, pbkEngine
-*/
+
     TELSERVICE_LEAVEFN("SearchPbForMatchL()")
 
     return matchingName;
@@ -2396,7 +2392,7 @@
 
     CContactIdArray* idArray = NULL;
 
-/*	if( aMatchType == EPhoneNumber )
+	if( aMatchType == EPhoneNumber )
 		{
 		idArray = aPbkEngine.MatchPhoneNumberL( aToMatch, aToMatch.Length() );
 		}
@@ -2412,7 +2408,7 @@
         CleanupStack::PopAndDestroy( findFrom );
 		}
 
-	CleanupStack::PushL( idArray ); */
+	CleanupStack::PushL( idArray );
     TELSERVICE_LEAVEFN( "SearchPbForMatchLC()" )
 	return idArray;
 	}
@@ -2680,7 +2676,7 @@
 
     aNewContact = ETrue;
 
-/*	if( idArrayPhoneNr->Count() && aNumber.Length() )
+	if( idArrayPhoneNr->Count() && aNumber.Length() )
 		{
 		// Open existing
 		if ( ShowDialogL( aNumber, EConfirmAddToPb ) )
@@ -2718,7 +2714,7 @@
 	CleanupStack::PopAndDestroy( 2 );		// idArrayEmail,idArrayPhoneNr
 
 	CleanupStack::PushL( contactItem );
-*/
+
     return contactItem;
     }
 
@@ -2734,7 +2730,7 @@
     {
     if( aFieldValue.Length() )
 		{
-  /*      TPbkContactItemField *dataField = aContactItem->FindField( aField );
+        TPbkContactItemField *dataField = aContactItem->FindField( aField );
 
         if( !dataField )
 			{
@@ -2762,7 +2758,7 @@
 			    {
                 aFormIndex = aContactItem->FindFieldIndex( *dataField );
 			    }
-            }*/
+            }
 		}
     }