Changeset 15311 for S60/trunk/S60WebUi

Show
Ignore:
Timestamp:
07/10/06 14:39:33 (3 years ago)
Author:
spadma
Message:

2006-07-10 David Carson <david.carson@nokia.com>

Reviewed by Sachin/Zalan.

Fix for network connection, remove use of InternetConnectionManager
http://bugzilla.opendarwin.org/show_bug.cgi?id=9451


  • WebKit\BrowserView\src\HttpLoaderEventToUiListener.cpp: (CHttpLoaderEventToUiListener::ConnectionRequest) Added check fo NULL pointer as aConnectionPtr could be null after the cb
  • S60WebUi\WebUi\src\WebUiSessionAndSecurity.cpp
  • S60WebUi\WebUi\inc\WebUiSessionAndSecurity.h Removed dependancy on InternetConnectionManager, and removed ShowSessionInfo as the information is available from the Connection Manager application. Constructor no longer takes a InternetConnectionManager reference.


  • S60WebUi\WebUi\data\WebUi.rss
  • S60WebUi\WebUi\inc\WebUi.hrh Removed ShowSessionInfo menu option


  • S60WebUi\WebUi\src\WebUiWindowContainer.cpp
    • S60WebUi\WebUi\inc\WebUiWindowContainer.h (CWebUiWindowContainer::HandleCommandL): Removed ShowSessionInfo option (CWebUiWindowContainer::NetworkConnectionNeededL): Made function empty as Symbian default handler does the work.
Location:
S60/trunk/S60WebUi/WebUi
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • S60/trunk/S60WebUi/WebUi/data/WebUi.rss

    r14648 r15311  
    181181 
    182182                MENU_ITEM { command = ECmdPageInfo; txt = "Page info"; }, 
    183                 MENU_ITEM { command = EWmlCmdInfoSession; txt = "Session info"; }, 
    184183                MENU_ITEM { command = EWmlCmdInfoSecurity; txt = "Security info"; } 
    185184        }; 

  • S60/trunk/S60WebUi/WebUi/inc/WebUi.hrh

    r14648 r15311  
    7878    ECmdPageInfo, 
    7979    ECmdNewWindow, 
    80     EWmlCmdInfoSession, 
    8180    EWmlCmdInfoSecurity, 
    8281    ECmdCloseAll, 

  • S60/trunk/S60WebUi/WebUi/inc/WebUiSessionAndSecurity.h

    r14549 r15311  
    33*  Name        : WebUiSessionAndSecurity.h 
    44*  Part of     : WebUI 
    5 *  Interface   :  
    6 *  Description :  
     5*  Interface   : 
     6*  Description : 
    77*  Version     : 3.1 
    88* 
    99*    Copyright (c) 2006, Nokia Corporation 
    1010*    All rights reserved. 
    11 *   
    12 *       Redistribution and use in source and binary forms, with or without 
    13 *       modification, are permitted provided that the following conditions 
    14 *       are met: 
    15 *   
     11* 
     12*   Redistribution and use in source and binary forms, with or without 
     13*   modification, are permitted provided that the following conditions 
     14*   are met: 
     15* 
    1616*      * Redistributions of source code must retain the above copyright 
    1717*        notice, this list of conditions and the following disclaimer. 
    … …  
    2323*        contributors may be used to endorse or promote products derived 
    2424*        from this software without specific prior written permission. 
    25 *   
    26 *       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
    27 *       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
    28 *       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
    29 *       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
    30 *       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
    31 *       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
    32 *       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
    33 *       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
    34 *       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
    35 *       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
    36 *       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
    37 *       DAMAGE. 
    38 *   
     25* 
     26*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
     27*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
     28*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
     29*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
     30*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
     31*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
     32*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
     33*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
     34*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
     35*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
     36*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
     37*   DAMAGE. 
     38* 
    3939*    Please see file patentlicense.txt for further grants. 
    4040* ============================================================================== 
    … …  
    4747// INCLUDE FILES 
    4848#include <BrCtlInterface.h> 
    49 #include <InternetConnectionManager.h> 
    5049 
    5150// FORWARD DECLARATIONS 
    … …  
    6160*/ 
    6261class CWebUiSessionAndSecurity : public CBase 
    63         { 
    64         public:         // Constructors and destructor                                   
    65                 /** 
     62  { 
     63  public:   // Constructors and destructor 
     64    /** 
    6665        * ~CWebUiSessionAndSecurity 
    6766        * Destructor 
    … …  
    7069        * @return none 
    7170        */ 
    72                 ~CWebUiSessionAndSecurity(); 
     71    ~CWebUiSessionAndSecurity(); 
    7372 
    7473        /** 
    … …  
    7675        * Default constructor 
    7776        * @since 3.1 
    78         * @param aConnection a Internet Connection Manager   
    79         * @param aEngine a window manager 
    80         * @return CWebUiSessionAndSecurity*  
     77        * @param aEngine a window manager 
     78        * @return CWebUiSessionAndSecurity* 
    8179        */ 
    82         static CWebUiSessionAndSecurity* NewL(CInternetConnectionManager& aConnection, 
    83                                         CBrCtlInterface& aEngine); 
     80        static CWebUiSessionAndSecurity* NewL(CBrCtlInterface& aEngine); 
    8481 
    85         public:  
    86         /** 
    87         * ShowSessionInfoL 
    88         * Shows session info dialog 
    89         * @since 3.1 
    90         * @param none 
    91         * @return void  
    92         */ 
    93         void ShowSessionInfoL(); 
    94  
     82  public: 
    9583        /** 
    9684        * ShowSecurityInfoL 
    9785        * Shows security info dialog / certificate details 
    9886        * @since 3.1 
    99         * @param none 
     87        * @param none 
    10088        * @return void 
    10189        */ 
    10290        void ShowSecurityInfoL(); 
    10391 
    104                 /** 
    105                 * ShowPageInfoL 
    106         * Shows page info dialog  
     92    /** 
     93    * ShowPageInfoL 
     94        * Shows page info dialog 
    10795        * @since 3.1 
    108         * @param none 
     96        * @param none 
    10997        * @return void 
    11098        */ 
    … …  
    113101 
    114102    private: 
    115          
     103 
    116104        /** 
    117105        * ConvertTDesC8ToHBufC16LC 
    118         * Converts TDesC8 buffer to HBufC16  
     106        * Converts TDesC8 buffer to HBufC16 
    119107        * @since 3.1 
    120108        * @param aSource 
    121109        * @param aDestination ownership passed to caller 
    122110        * @return void 
    123         */                 
     111        */ 
    124112        void ConvertTDesC8ToHBufC16LC( TDesC8& aSource, HBufC16*& aDestination ); 
    125113 
    126114        /** 
    127115        * FillDNinfoL 
    128         * Adds two distinguished names to security info  
     116        * Adds two distinguished names to security info 
    129117        * (names are: CN, O, OU, L, C) 
    130118        * @since 3.1 
    … …  
    132120        * @param aBuf 
    133121        * @return void 
    134         */                 
     122        */ 
    135123        void FillDNinfoL ( TDNInfo aDNInfo,  HBufC* aBuf ); 
    136             
     124 
    137125        /** 
    138126        * HttpSecurityInfoL 
    … …  
    142130        * @param aMessage 
    143131        * @return void 
    144         */  
     132        */ 
    145133        void HttpSecurityInfoL( const TCertInfo* aCertInfo, HBufC& aMessage ); 
    146134 
    147135    private: 
    148      
    149                 /** 
    150                 * CWebUiSessionAndSecurity 
    151                 * Constructor 
    152                 * @since 3.1 
    153                 * @param none 
    154                 * @return none 
    155                 */ 
    156         CWebUiSessionAndSecurity(); 
    157136 
    158         private: 
    159          
    160                 CInternetConnectionManager* iConnection; // not owned, not responsible for deleting 
    161                 CBrCtlInterface* iEngine;                                // not owned, not responsible for deleting 
     137    /** 
     138    * CWebUiSessionAndSecurity 
     139    * Constructor 
     140    * @since 3.1 
     141    * @param none 
     142    * @return none 
     143    */ 
     144        CWebUiSessionAndSecurity(CBrCtlInterface& aEngine); 
    162145 
    163         }; 
     146  private: 
     147 
     148    CBrCtlInterface* iEngine;        // not owned, not responsible for deleting 
     149 
     150  }; 
    164151 
    165152 

  • S60/trunk/S60WebUi/WebUi/inc/WebUiWindowContainer.h

    r14549 r15311  
    1010*    All rights reserved. 
    1111* 
    12 *       Redistribution and use in source and binary forms, with or without 
    13 *       modification, are permitted provided that the following conditions 
    14 *       are met: 
     12*   Redistribution and use in source and binary forms, with or without 
     13*   modification, are permitted provided that the following conditions 
     14*   are met: 
    1515* 
    1616*      * Redistributions of source code must retain the above copyright 
    … …  
    2424*        from this software without specific prior written permission. 
    2525* 
    26 *       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
    27 *       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
    28 *       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
    29 *       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
    30 *       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
    31 *       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
    32 *       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
    33 *       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
    34 *       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
    35 *       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
    36 *       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
    37 *       DAMAGE. 
     26*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
     27*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
     28*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
     29*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
     30*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
     31*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
     32*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
     33*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
     34*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
     35*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
     36*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
     37*   DAMAGE. 
    3838* 
    3939*    Please see file patentlicense.txt for further grants. 
    … …  
    4848#include "WebUiObserver.h" 
    4949#include <BrCtlInterface.h> 
    50     
     50 
    5151// CONSTANTS 
    5252 
    … …  
    137137        * @return void 
    138138        */ 
    139                 void SaveAsBookmarkL(); 
     139    void SaveAsBookmarkL(); 
    140140 
    141141        /** 
    … …  
    181181        */ 
    182182        CWebUiAutomatedTests* AutomatedTests(); 
    183          
     183 
    184184    private: // Functions from base classes 
    185185 
    … …  
    274274        */ 
    275275        TBool IsAutomatedTests(); 
    276          
     276 
    277277        /** 
    278278        * ChangeEditPane 
    … …  
    378378        TInt AddFolderToDbL( TDesC& aFolderName ); 
    379379 
    380                 /** 
    381                 * ErrorNoteL 
    382                 * Error note display 
    383                 * @since 3.1 
     380    /** 
     381    * ErrorNoteL 
     382    * Error note display 
     383    * @since 3.1 
    384384        * @param aPrompt 
    385385        * @return void 
    386                 */ 
    387                 void ErrorNoteL( const TDesC& aPrompt ); 
    388  
    389                 /** 
    390                 * InfoNoteL 
    391                 * Confirmation note display 
    392                 * @since 3.1 
    393                 * @param aPrompt 
    394                 * @return void 
    395                 */ 
    396                 void InfoNoteL( const TDesC& aPrompt ); 
     386    */ 
     387    void ErrorNoteL( const TDesC& aPrompt ); 
     388 
     389    /** 
     390    * InfoNoteL 
     391    * Confirmation note display 
     392    * @since 3.1 
     393    * @param aPrompt 
     394    * @return void 
     395    */ 
     396    void InfoNoteL( const TDesC& aPrompt ); 
    397397 
    398398    private: // data 
    … …  
    408408        HBufC*                      iLastFind;      // owned, responsible for deleting 
    409409 
    410         CInternetConnectionManager* iConnection;    // owned, responsible for deleting 
    411  
    412         CActiveApDb*                iDb;            // owned, responsible for deleting 
    413410        TBool                       iCanLog; 
    414411 
    … …  
    417414//      CSchemeHandler*             iSchemeHandler; 
    418415        CDocumentHandler*           iHandler;       // owned, responsible for deleting 
    419          
    420         CWebUiAutomatedTests*       iAutomatedTests;// owned, responsible for deleting    
     416 
     417        CWebUiAutomatedTests*       iAutomatedTests;// owned, responsible for deleting 
    421418 
    422419    }; 

  • S60/trunk/S60WebUi/WebUi/src/WebUiSessionAndSecurity.cpp

    r14549 r15311  
    33*  Name        : WebUiSessionAndSecurity.cpp 
    44*  Part of     : WebUI 
    5 *  Interface   :  
    6 *  Description :  
     5*  Interface   : 
     6*  Description : 
    77*  Version     : 3.1 
    88* 
    99*    Copyright (c) 2006, Nokia Corporation 
    1010*    All rights reserved. 
    11 *   
    12 *       Redistribution and use in source and binary forms, with or without 
    13 *       modification, are permitted provided that the following conditions 
    14 *       are met: 
    15 *   
     11* 
     12*   Redistribution and use in source and binary forms, with or without 
     13*   modification, are permitted provided that the following conditions 
     14*   are met: 
     15* 
    1616*      * Redistributions of source code must retain the above copyright 
    1717*        notice, this list of conditions and the following disclaimer. 
    … …  
    2323*        contributors may be used to endorse or promote products derived 
    2424*        from this software without specific prior written permission. 
    25 *   
    26 *       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
    27 *       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
    28 *       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
    29 *       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
    30 *       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
    31 *       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
    32 *       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
    33 *       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
    34 *       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
    35 *       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
    36 *       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
    37 *       DAMAGE. 
    38 *   
     25* 
     26*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
     27*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
     28*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
     29*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
     30*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
     31*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
     32*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
     33*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
     34*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
     35*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
     36*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
     37*   DAMAGE. 
     38* 
    3939*    Please see file patentlicense.txt for further grants. 
    4040* ============================================================================== 
    … …  
    6666// ---------------------------------------------------- 
    6767// 
    68 CWebUiSessionAndSecurity::CWebUiSessionAndSecurity() 
     68CWebUiSessionAndSecurity::CWebUiSessionAndSecurity(CBrCtlInterface& aEngine) 
     69: iEngine(&aEngine) 
    6970{ 
    7071} 
    … …  
    7576// ---------------------------------------------------- 
    7677// 
    77 CWebUiSessionAndSecurity* CWebUiSessionAndSecurity::NewL(CInternetConnectionManager& aConnection,  
    78                                                                                 CBrCtlInterface& aEngine) 
     78CWebUiSessionAndSecurity* CWebUiSessionAndSecurity::NewL( 
     79                    CBrCtlInterface& aEngine) 
    7980{ 
    80         CWebUiSessionAndSecurity* session = new(ELeave) CWebUiSessionAndSecurity(); 
    81         CleanupStack::PushL( session ); 
    82         session->iConnection = &aConnection; 
    83  
    84         session->iEngine = &aEngine; 
    85         CleanupStack::Pop();    // session 
    86         return session; 
     81  CWebUiSessionAndSecurity* session = new(ELeave) CWebUiSessionAndSecurity(aEngine); 
     82  return session; 
    8783} 
    8884 
    … …  
    9692 
    9793// ---------------------------------------------------- 
    98 // CWebUiSessionAndSecurity::ShowSessionInfoL 
    99 // ---------------------------------------------------- 
    100 // 
    101 void CWebUiSessionAndSecurity::ShowSessionInfoL() 
    102     { 
    103         HBufC* header = StringLoader::LoadLC( R_WML_SESSION_VIEW_TITLE ); 
    104     HBufC* message = HBufC::NewLC( KWmlSessionInfoMaxLength ); 
    105  
    106     HBufC* value = StringLoader::LoadLC( R_WML_SESSION_VIEW_AP ); 
    107     message->Des().Append( *value ); 
    108     message->Des().Append( TChar( '\n' ) ); 
    109     CleanupStack::PopAndDestroy();  // value 
    110  
    111         value = iConnection->CurrentApNameLC(); 
    112     message->Des().Append( value->Des() ); 
    113     message->Des().Append( TChar( '\n' ) );  
    114     CleanupStack::PopAndDestroy();  // value 
    115  
    116     // Bearer type 
    117     value = StringLoader::LoadLC( R_WML_SESSION_VIEW_BT ); 
    118     message->Des().Append( *value ); 
    119     message->Des().Append( TChar( '\n' ) ); 
    120     CleanupStack::PopAndDestroy();  // value 
    121  
    122     TApBearerType bt = iConnection->CurrentBearerTypeL(); 
    123     switch ( bt ) 
    124     { 
    125     case EApBearerTypeCSD: 
    126         { 
    127         value = StringLoader::LoadLC( R_WML_BEARER_DATA_CALL ); 
    128         break; 
    129         } 
    130     case EApBearerTypeGPRS: 
    131         { 
    132         value = StringLoader::LoadLC( R_WML_BEARER_PACKET_DATA ); 
    133         break; 
    134         } 
    135     case EApBearerTypeHSCSD: 
    136         { 
    137         value = StringLoader::LoadLC( R_WML_BEARER_HSCSD ); 
    138         break; 
    139         } 
    140     default: 
    141         value = HBufC::NewLC( 1 ); 
    142         break; 
    143     } 
    144  
    145     message->Des().Append( value->Des() ); 
    146     message->Des().Append( TChar( '\n' ) );  
    147     CleanupStack::PopAndDestroy();  // value 
    148  
    149     // Max conn. speed 
    150         value = StringLoader::LoadLC( R_WML_SESSION_VIEW_CS ); 
    151     message->Des().Append( *value ); 
    152     message->Des().Append( TChar( '\n' ) ); 
    153     CleanupStack::PopAndDestroy();  // value 
    154  
    155     TApCallSpeed speed = iConnection->CurrentConnectionSpeed(); 
    156     value = HBufC::NewLC( sizeof( KWmlConnSpeed43200 ) ); 
    157     switch ( speed ) 
    158     { 
    159         case KSpeed9600: 
    160         { 
    161         *value = KWmlConnSpeed9600(); 
    162         break; 
    163         } 
    164     case KSpeed14400: 
    165         { 
    166         *value = KWmlConnSpeed14400(); 
    167         break; 
    168         } 
    169     case KSpeed19200: 
    170         { 
    171         *value = KWmlConnSpeed19200(); 
    172         break; 
    173         } 
    174     case KSpeed28800: 
    175         { 
    176         *value = KWmlConnSpeed28800(); 
    177         break; 
    178         } 
    179     case KSpeed38400: 
    180         { 
    181         *value = KWmlConnSpeed38400(); 
    182         break; 
    183         } 
    184     case KSpeed43200: 
    185         { 
    186         *value = KWmlConnSpeed43200(); 
    187         break; 
    188         } 
    189         case KSpeedAutobaud:    // default value 
    190     default: 
    191         { 
    192         CleanupStack::PopAndDestroy();  // value 
    193                 value = StringLoader::LoadLC( R_WML_CONN_SPEED_AD ); 
    194         break; 
    195         } 
    196     } 
    197      
    198     message->Des().Append( value->Des() ); 
    199     message->Des().Append( TChar( '\n' ) );  
    200     CleanupStack::PopAndDestroy();  // value 
    201  
    202     CAknMessageQueryDialog* dlg = CAknMessageQueryDialog::NewL( *message ); 
    203     dlg->PrepareLC( R_BROWSER_SESSION_INFO ); 
    204     CAknPopupHeadingPane* hPane = dlg->QueryHeading(); 
    205     if ( hPane ) 
    206         { 
    207         hPane->SetTextL( *header ); 
    208         } 
    209     dlg->RunLD(); 
    210     CleanupStack::PopAndDestroy( 2 );   // header, message 
    211     } 
    212  
    213 // ---------------------------------------------------- 
    21494// CWebUiSessionAndSecurity::ShowSecurityInfoL 
    21595// ---------------------------------------------------- 
    … …  
    21797void CWebUiSessionAndSecurity::ShowSecurityInfoL() 
    21898    { 
    219         const TCertInfo* certInfo = iEngine->CertInfo(); 
     99  const TCertInfo* certInfo = iEngine->CertInfo(); 
    220100 
    221101    HBufC* header; 
    222     HBufC* message = HBufC::NewLC( KWmlSecurityInfoMaxLength );  
    223  
    224  
    225     header = StringLoader::LoadLC( R_WML_SECURITY_VIEW_TITLE );     
     102    HBufC* message = HBufC::NewLC( KWmlSecurityInfoMaxLength ); 
     103 
     104 
     105    header = StringLoader::LoadLC( R_WML_SECURITY_VIEW_TITLE ); 
    226106    HttpSecurityInfoL( certInfo, *message); 
    227107 
    … …  
    247127{ 
    248128    TInt p( 0 ); 
    249         HBufC* url = iEngine->PageInfoLC( TBrCtlDefs::EPageInfoUrl ); 
    250         HBufC* header = StringLoader::LoadLC( R_BROWSER_QUERY_CURRENT_PAGE ); 
     129  HBufC* url = iEngine->PageInfoLC( TBrCtlDefs::EPageInfoUrl ); 
     130  HBufC* header = StringLoader::LoadLC( R_BROWSER_QUERY_CURRENT_PAGE ); 
    251131    HBufC* urltxt = StringLoader::LoadLC( R_BROWSER_QUERY_CURRENT_PAGE_URL ); 
    252         HBufC* urlMessage = HBufC::NewLC( url->Length() + urltxt->Length() + 2 ); 
    253          
    254         urlMessage->Des().Append(*urltxt ); 
    255         urlMessage->Des().Append(_L("\n")); 
    256         urlMessage->Des().Append(*url); 
    257  
    258         CAknMessageQueryDialog* dlg = CAknMessageQueryDialog::NewL( *urlMessage ); 
    259         dlg->PrepareLC( R_BROWSER_PAGE_INFO  ); 
    260  
    261         CAknPopupHeadingPane* hPane = dlg->QueryHeading(); 
    262         if ( hPane ) 
    263         { 
    264                 hPane->SetTextL( *header ); 
    265         } 
    266         dlg->RunLD(); 
    267          
    268         CleanupStack::PopAndDestroy(4); // url, header, urltxt,urlMessage 
     132  HBufC* urlMessage = HBufC::NewLC( url->Length() + urltxt->Length() + 2 ); 
     133 
     134  urlMessage->Des().Append(*urltxt ); 
     135  urlMessage->Des().Append(_L("\n")); 
     136  urlMessage->Des().Append(*url); 
     137 
     138  CAknMessageQueryDialog* dlg = CAknMessageQueryDialog::NewL( *urlMessage ); 
     139  dlg->PrepareLC( R_BROWSER_PAGE_INFO  ); 
     140 
     141  CAknPopupHeadingPane* hPane = dlg->QueryHeading(); 
     142  if ( hPane ) 
     143  { 
     144    hPane->SetTextL( *header ); 
     145  } 
     146  dlg->RunLD(); 
     147 
     148  CleanupStack::PopAndDestroy(4); // url, header, urltxt,urlMessage 
    269149} 
    270150 
    … …  
    275155// 
    276156void CWebUiSessionAndSecurity::HttpSecurityInfoL( const TCertInfo* aCertInfo, 
    277                                                                                                   HBufC& aMessage ) 
     157                          HBufC& aMessage ) 
    278158    { 
    279159    HBufC* value; 
    280     HBufC* prompt;  
    281