cmmanager/cmmgr/Framework/Src/destdlg.cpp
branchRCL_3
changeset 17 c14618f9de99
parent 1 40cb640ef159
--- a/cmmanager/cmmgr/Framework/Src/destdlg.cpp	Wed Mar 31 22:15:10 2010 +0300
+++ b/cmmanager/cmmgr/Framework/Src/destdlg.cpp	Wed Apr 14 16:22:04 2010 +0300
@@ -120,10 +120,14 @@
         }
     if ( iTitlePane )
         {
-        // set old text back, if we have it...
+        // set old text back, if we have it and if we are going back to
+        // Connectivity Settings view
         if ( iOldTitleText )
             {
-            TRAP_IGNORE( iTitlePane->SetTextL( *iOldTitleText ) );
+            if ( iExitReason == KDialogUserBack )
+                {
+                TRAP_IGNORE( iTitlePane->SetTextL( *iOldTitleText ) );
+                }
             delete iOldTitleText;
             }
         }
@@ -365,9 +369,13 @@
             {
             CLOG_WRITE( "CDestDlg::ProcessCommandL command: exit");
             iExitReason = KDialogUserExit;
+            iCmManagerImpl->WatcherUnRegister();
+            TryExitL( iExitReason );
+            break;            
             }
         case EAknSoftkeyBack:
             {
+            iExitReason = KDialogUserBack;
             iCmManagerImpl->WatcherUnRegister();
             TryExitL( iExitReason );
             break;
@@ -403,8 +411,7 @@
                 }
             if ( iConnSettingsImpl->RunDefaultConnecitonRBPageL( selection ) )
                 {
-                defConnValue = selection.ConvertToDefConn();
-                ShowDefaultSetNoteL( defConnValue );
+                defConnValue = selection.ConvertToDefConn();                
                 
                 iCmManagerImpl->WriteDefConnL( defConnValue );
                 HandleListboxDataChangeL();
@@ -611,6 +618,7 @@
             if (!iProcessing)
                 {
                 *iExiting = EFalse;
+                iExitReason = KDialogUserBack;
                 retval = ETrue;                
                 }
             break;
@@ -1077,11 +1085,7 @@
                         }                    
 
                     iListbox->HandleItemAdditionL();
-
-                    TCmCommonUi::ShowNoteL( R_CMWIZARD_NEW_DEST_ADDED,
-                                            destName,
-                                            TCmCommonUi::ECmOkNote );
-                    
+               
                     // Sets the mittle soft key text to "Open"                        
                     SetMskL( R_QTN_MSK_OPEN );