Revision: 201001 PDK_3.0.f
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Mon, 18 Jan 2010 20:22:00 +0200
changeset 33 97c9f46387be
parent 32 92a061761a7b
child 37 481242ead638
Revision: 201001 Kit: 201003
browserplugins/browseraudiovideoplugin/data/BrowserAudioVideoPlugin.rss
browserui/browser/BrowserAppSrc/BrowserAppUi.cpp
browserui/browser/BrowserAppSrc/BrowserContentView.cpp
browserui/browser/FavouritesInc/BrowserBookmarksView.h
browserui/browser/FavouritesInc/BrowserFavouritesView.h
browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp
browserui/browser/Group/BrowserLogger.inc
browserui/browser/Rom/Browser_stub_32.pkg
browserui/browser/help/group/bld.inf
browserui/operatormenu/group/bld.inf
browserui/operatormenu/help/group/bld.inf
pushmtm/Plugins/Group/Bld.inf
pushmtm/help/group/bld.inf
--- a/browserplugins/browseraudiovideoplugin/data/BrowserAudioVideoPlugin.rss	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserplugins/browseraudiovideoplugin/data/BrowserAudioVideoPlugin.rss	Mon Jan 18 20:22:00 2010 +0200
@@ -31,6 +31,7 @@
 
 #include "BrowserAudioVideoPlugin.hrh"
 #include <browseraudiovideoplugin.loc>
+#include <WmlBrowser.loc>
 
 //  RESOURCE DEFINITIONS 
 
--- a/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp	Mon Jan 18 20:22:00 2010 +0200
@@ -2387,7 +2387,8 @@
     //Close the uploading dialog.
     iDialogsProvider->UploadProgressNoteL(
 	                0, 0, ETrue, (MBrowserDialogsProviderObserver *)this );
-
+    //connection has been lost, so cancel the authentication dialog.
+    iDialogsProvider->CancelAll();
     // SendDisconnectEventL();
     // not needed as by that point HTTPSession was already shutdown by executing disconnect menu option
     // will cause a crash when user tries to quickly reconnect right after disconnecting, as HTTP session
--- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Mon Jan 18 20:22:00 2010 +0200
@@ -1938,6 +1938,12 @@
                                 ( *item, CBrowserFavouritesModel::ESaved ) );
                     queryName = EFalse;
                     AddBMUidToLastPlaceToCurrentListL( item->Uid() );
+                    
+                    // To retain FavIcon in iconDatabase, we need to reference icon bitmap reference at least once
+                    HBufC* url = ApiProvider().BrCtlInterface().PageInfoLC(TBrCtlDefs::EPageInfoUrl);
+                    CGulIcon *icon = ApiProvider().BrCtlInterface().GetBitmapData(*url, TBrCtlDefs::EBitmapFavicon);
+                    CleanupStack::PopAndDestroy(); //url
+                    delete icon;
                     }
                 else if( KErrAlreadyExists == err )
                     {
--- a/browserui/browser/FavouritesInc/BrowserBookmarksView.h	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserui/browser/FavouritesInc/BrowserBookmarksView.h	Mon Jan 18 20:22:00 2010 +0200
@@ -287,6 +287,8 @@
         * up an error note.
         */
         virtual void RefreshL( TBool aDbErrorNote = EFalse );
+        
+        void HandleForegroundEventL( TBool aForeground );
 
 	protected:	// protected methods from CAknView
 
--- a/browserui/browser/FavouritesInc/BrowserFavouritesView.h	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserui/browser/FavouritesInc/BrowserFavouritesView.h	Mon Jan 18 20:22:00 2010 +0200
@@ -309,7 +309,7 @@
         * Handle foreground event.
         * @param aForeground ETrue if foreground.
         */
-        void HandleForegroundEventL( TBool aForeground );
+        virtual void HandleForegroundEventL( TBool aForeground );
 
     protected:	// from MEikListBoxObserver
 
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Mon Jan 18 20:22:00 2010 +0200
@@ -2792,4 +2792,19 @@
             }      
         }
     }
+
+void CBrowserBookmarksView::HandleForegroundEventL( TBool aForeground )
+    {
+    // make sure we call base class function before proceeding
+    CBrowserFavouritesView::HandleForegroundEventL(aForeground);
+    if ( aForeground )
+        {
+        if ( TheContainer()->GotoPaneActive() && TheContainer()->GotoPane()->PopupList()->IsPoppedUp() )
+            {
+            // The pop up messes the screen when changing layouts
+            // So make sure to redraw the pane while coming to foreground 
+            TheContainer()->GotoPane()->PopupList()->HandleResourceChange(KEikDynamicLayoutVariantSwitch);
+            }
+        }
+    }
 // End of File
--- a/browserui/browser/Group/BrowserLogger.inc	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserui/browser/Group/BrowserLogger.inc	Mon Jan 18 20:22:00 2010 +0200
@@ -20,4 +20,4 @@
 #if defined( __BROWSER_PERF_LOG_ENABLE )
 	MACRO I__BROWSER_PERF_LOG_ENABLED
 	#define I__BROWSER_PERF_LOG_ENABLED
-#endif
\ No newline at end of file
+#endif
--- a/browserui/browser/Rom/Browser_stub_32.pkg	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserui/browser/Rom/Browser_stub_32.pkg	Mon Jan 18 20:22:00 2010 +0200
@@ -1,18 +1,3 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: 
-;
 
 ;Languages
 &EN
--- a/browserui/browser/help/group/bld.inf	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserui/browser/help/group/bld.inf	Mon Jan 18 20:22:00 2010 +0200
@@ -2,13 +2,13 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
+* Nokia Corporation - initial contribution.
+*
 * Contributors:
 * 
 * 
@@ -29,4 +29,4 @@
 ../inc/browser.hlp.hrh	APP_LAYER_PLATFORM_EXPORT_PATH(csxhelp/browser.hlp.hrh)
 ../rom/browseruihelps_variant.iby		CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(browseruihelps_variant.iby)
 
-#endif
\ No newline at end of file
+#endif
--- a/browserui/operatormenu/group/bld.inf	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserui/operatormenu/group/bld.inf	Mon Jan 18 20:22:00 2010 +0200
@@ -59,4 +59,4 @@
 PRJ_MMPFILES
 ./OperatorMenu.mmp
 
-#endif 
\ No newline at end of file
+#endif 
--- a/browserui/operatormenu/help/group/bld.inf	Thu Jan 07 12:48:02 2010 +0200
+++ b/browserui/operatormenu/help/group/bld.inf	Mon Jan 18 20:22:00 2010 +0200
@@ -2,13 +2,13 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
+* Nokia Corporation - initial contribution.
+*
 * Contributors:
 * 
 * 
@@ -29,4 +29,4 @@
 ../inc/ope.hlp.hrh	APP_LAYER_PLATFORM_EXPORT_PATH(csxhelp/ope.hlp.hrh)
 ../rom/operatormenuhelps_variant.iby		CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(operatormenuhelps_variant.iby)
 
-#endif
\ No newline at end of file
+#endif
--- a/pushmtm/Plugins/Group/Bld.inf	Thu Jan 07 12:48:02 2010 +0200
+++ b/pushmtm/Plugins/Group/Bld.inf	Mon Jan 18 20:22:00 2010 +0200
@@ -26,9 +26,10 @@
 
 
 PRJ_MMPFILES
-
+#if defined( __S60_32__) || defined( __S60_50__) 
 // Remove Symbian Push Content Handler
 gnumakefile PushContentHandlerClean.mk
+#endif
 // Build our Push Content Handler
 PushMtmPushContentHandler.mmp
 
--- a/pushmtm/help/group/bld.inf	Thu Jan 07 12:48:02 2010 +0200
+++ b/pushmtm/help/group/bld.inf	Mon Jan 18 20:22:00 2010 +0200
@@ -2,13 +2,13 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
+* Nokia Corporation - initial contribution.
+*
 * Contributors:
 * 
 * 
@@ -29,4 +29,4 @@
 ../inc/wpush.hlp.hrh	APP_LAYER_PLATFORM_EXPORT_PATH(csxhelp/wpush.hlp.hrh)
 ../rom/pushmtmhelps_variant.iby		CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(pushmtmhelps_variant.iby)
 
-#endif
\ No newline at end of file
+#endif