Changeset 15507 for S60/trunk/S60WebUi

Timestamp:

07/18/06 13:22:45 (2 years ago)

Author:

brmorris

Message:

2006-07-17 Bradley <bradley.morrison@nokia.com>

Reviewed by Sachin/Zalan.

Various fixes - see ChangeLogs for details.
Part 1 of 4.

Location:

S60/trunk/S60WebUi

Files:

• ChangeLog (modified) (1 diff)
• WebUi/data/WebUi.rss (modified) (1 diff)
• WebUi/data/icons (added)
• WebUi/data/icons/reindeer.bmp (added)
• WebUi/data/icons/reindeer_mask_soft.bmp (added)
• WebUi/group/bld.inf (modified) (1 diff)
• WebUi/inc/WebUi.hrh (modified) (1 diff)
• WebUi/src/WebUiLoadObserver.cpp (modified) (1 diff)
• WebUi/src/WebUiSettings.cpp (modified) (1 diff)

S60/trunk/S60WebUi/ChangeLog

@@ +1 @@
+2006-07-18  brmorris  <bradley.morrison@nokia.com>
+
+        (on behalf of Wei). Reviewed by Zalan/Sachin.
+
+        * WebUi/data/WebUi.rss: Session info menu item
+        * WebUi/data/icons/reindeer.bmp: Added.
+        * WebUi/data/icons/reindeer_mask_soft.bmp: Added.
+        * WebUi/group/bld.inf: Added new reindeer bitmaps
+        * WebUi/inc/WebUi.hrh: Added EWmlCmdInfoSession
+        * WebUi/src/WebUiLoadObserver.cpp: 
+        (CWebUiLoadObserver::HandleBrowserLoadEventL): pop stack if title undef
+        * WebUi/src/WebUiSettings.cpp: 
+        (CWebUiSettings::SetEngineSettingL): Added missing break in case 
+
 2006-07-10  David Carson  <david.carson@nokia.com>
 

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

@@ -181 +181 @@
 
                 MENU_ITEM { command = ECmdPageInfo; txt = "Page info"; },
+                MENU_ITEM { command = EWmlCmdInfoSession; txt = "Session info"; },
                 MENU_ITEM { command = EWmlCmdInfoSecurity; txt = "Security info"; }
         };

S60/trunk/S60WebUi/WebUi/group/bld.inf

@@ -41 +41 @@
 
 PRJ_EXPORTS
-
+..\data\icons\reindeer.bmp              \epoc32\s60\icons\reindeer.bmp
+..\data\icons\reindeer_mask_soft.bmp    \epoc32\s60\icons\reindeer_mask_soft.bmp
 
 PRJ_MMPFILES

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

@@ -78 +78 @@
     ECmdPageInfo,
     ECmdNewWindow,
+    EWmlCmdInfoSession,
     EWmlCmdInfoSecurity,
     ECmdCloseAll,

S60/trunk/S60WebUi/WebUi/src/WebUiLoadObserver.cpp

@@ -204 +204 @@
                 {
                 HBufC* title = Engine()->PageInfoLC( TBrCtlDefs::EPageInfoTitle );
-                if (title)
-                    {
                     // Title added to cleanup stack, by PageInfoLC, increment count
                     cleanupCount++;
-                    }
-                else
+                if (!title)
                     {
+                    CleanupStack::Check(title);
+                    CleanupStack::Pop(title);
+                    cleanupCount--; 
                     // Set url as title
                     title = url->Des().AllocLC();

S60/trunk/S60WebUi/WebUi/src/WebUiSettings.cpp

@@ -405 +405 @@
                     }
                 }
+            break;
             }