--- a/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp	Tue Jul 06 14:53:02 2010 +0300
+++ b/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp	Wed Aug 18 10:19:22 2010 +0300
@@ -390,7 +390,6 @@
      iDeviceDialog( NULL ),
      iDCS ( KPhCltDcsUnknown ),
      iReturnResultPckg ( iReturnResult ),
-     iTextResolver ( EFalse ),
      iTextBuffer ( NULL )
     {
     CActiveScheduler::Add( this );
@@ -460,9 +459,9 @@
 void CPhSrvUssdManager::ConstructL( MPhSrvPhoneInterface& aPhoneInterface )
     {
     _DPRINT( 4, "PhSrv.ConstructL.Start" );
-    iTextResolver = HbTextResolverSymbian::Init( 
+    const TBool textResolver = HbTextResolverSymbian::Init( 
         KUssdLocFilename, KLocPath );
-    _DDPRINT( 4, "PhSrv.ConstructL.ussd loc:", iTextResolver );
+    _DDPRINT( 4, "PhSrv.ConstructL.ussd loc:", textResolver );
     User::LeaveIfError( iTimer.CreateLocal() );
 
     User::LeaveIfError( iMobileUssdMessaging.Open( aPhoneInterface.PhSrvMobilePhone() ) );
@@ -867,6 +866,7 @@
             iDeviceDialog->SetObserver( this );
             iDeviceDialog->SetTimeout( KPhSrvUssdTimeout );
             iDeviceDialog->SetDismissPolicy ( KPhSrvUssdPopupDismissPolicy );
+            iDeviceDialog->SetIconVisible(EFalse);
             
             // Show left key with empty string accoring to ui concept
             iDeviceDialog->SetButton( 
@@ -1425,8 +1425,7 @@
             }
         if ( iClearArray )
             {
-            iTextResolver = HbTextResolverSymbian::Init( 
-                KCommonLocFilename, KLocPath );
+            HbTextResolverSymbian::Init( KCommonLocFilename, KLocPath );
             _DPRINT( 4, "PhSrv.LGMQ.use common loc file" );
             // Yes, No
             iDeviceDialog->SetButton(
@@ -1440,8 +1439,7 @@
                 CHbDeviceMessageBoxSymbian::ERejectButton, 
                 LoadDefaultString( KUssdNo ) );  
             _DPRINT( 4, "PhSrv.LGMQ.Yes&No" );
-            iTextResolver = HbTextResolverSymbian::Init( 
-                KUssdLocFilename, KLocPath );
+            HbTextResolverSymbian::Init( KUssdLocFilename, KLocPath );
             _DPRINT( 4, "PhSrv.LGMQ.back up to use ussd loc file" );
             }
         iReceivedMessage.Zero();
@@ -2175,7 +2173,7 @@
         }
     TInt err = KErrNone;
     TPtrC ptr( aText );
-    if ( iTextResolver && ptr.Length() )
+    if ( ptr.Length() )
         {
         TRAP( err, iTextBuffer = HbTextResolverSymbian::LoadL( ptr ) );
         _DDPRINT( 4, "PhSrv.LoadDefaultString.LoadL.%d", err );