connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/connectingviadiscreetpopup.cpp
branchRCL_3
changeset 12 ea6e024ea6f9
parent 8 2e6c4614c58e
--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/connectingviadiscreetpopup.cpp	Fri Feb 19 23:12:51 2010 +0200
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/connectingviadiscreetpopup.cpp	Fri Mar 12 15:44:18 2010 +0200
@@ -185,13 +185,11 @@
         HBufC* stringText2 = NULL;
         if (iConnectionName)
             {
-            stringText2 = StringLoader::LoadLC(
-                    R_QTN_OCC_CONNECTING_DISCREET_POPUP_TEXT2,
-                    *iConnectionName);
+            stringText2 = iConnectionName;
             }
         else
             {
-            stringText2 = _L("''").AllocLC();
+            stringText2 = KNullDesC().AllocLC();
             }
 
         CAknDiscreetPopup::ShowGlobalPopupL(*stringText1, // first text row
@@ -205,7 +203,13 @@
                 NULL, // command observer
                 KDiscreetPopupUid, // application to be launched
                 KDiscreetPopupViewUid); // view to be activated
-        CleanupStack::PopAndDestroy(2);
+        
+        if (!iConnectionName)
+            {
+            CleanupStack::PopAndDestroy( stringText2 );
+            }
+        
+        CleanupStack::PopAndDestroy( stringText1 );
         }
 
     // Cleanup