# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1261032438 -7200 # Node ID 868cceedabd3b9ee6f90c28d340f1a317a4e15b7 # Parent b57c5fc53578eaa416e2f008000ae2307b59e9e6 Revision: 200948 Kit: 200951 diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browseraudiovideoplugin/group/BLD.INF --- a/browserplugins/browseraudiovideoplugin/group/BLD.INF Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browseraudiovideoplugin/group/BLD.INF Thu Dec 17 08:47:18 2009 +0200 @@ -17,7 +17,7 @@ #include -#include "../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../../../mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh" PRJ_PLATFORMS DEFAULT diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browseraudiovideoplugin/group/BrowserAudioVideoPluginEcom.mmp --- a/browserplugins/browseraudiovideoplugin/group/BrowserAudioVideoPluginEcom.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browseraudiovideoplugin/group/BrowserAudioVideoPluginEcom.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include TARGET npBrowserAudioVideoPlugin.dll TARGETTYPE PLUGIN diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browseraudiovideoplugin/inc/BavpPlugin.h --- a/browserplugins/browseraudiovideoplugin/inc/BavpPlugin.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browseraudiovideoplugin/inc/BavpPlugin.h Thu Dec 17 08:47:18 2009 +0200 @@ -22,11 +22,11 @@ // INCLUDES #include #include -#include // For base class MPluginNotifier +#include // For base class MPluginNotifier #include // For displaying note #include #include -#include +#include #include "BavpNPObject.h" #include diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browseraudiovideoplugin/inc/BavpView.h --- a/browserplugins/browseraudiovideoplugin/inc/BavpView.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browseraudiovideoplugin/inc/BavpView.h Thu Dec 17 08:47:18 2009 +0200 @@ -26,7 +26,7 @@ #include #include "BrowserAudioVideoPlugin.hrh" -#include +#include // CLASS DECLARATION class CBavpPlugin; diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browseraudiovideoplugin/src/BavpController.cpp --- a/browserplugins/browseraudiovideoplugin/src/BavpController.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browseraudiovideoplugin/src/BavpController.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include "BavpController.h" diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browseraudiovideoplugin/src/BavpMain.cpp --- a/browserplugins/browseraudiovideoplugin/src/BavpMain.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browseraudiovideoplugin/src/BavpMain.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -22,7 +22,7 @@ #include // For NPError #include // For NPNetscapeFuncs #include -#include +#include #include "BavpLogger.h" #include "BavpPlugin.h" // For bap_xx methods diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browseraudiovideoplugin/src/BavpView.cpp --- a/browserplugins/browseraudiovideoplugin/src/BavpView.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browseraudiovideoplugin/src/BavpView.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -25,12 +25,12 @@ #include #include // For TResourceReader #include -#include +#include #include // For text #include "BavpLogger.h" #include "BavpView.h" -#include "BrCtlDefs.h" +#include "brctldefs.h" #include "BavpController.h" #include "BavpPlugin.h" diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browseraudiovideoplugin/src/BavpVolumeHandler.cpp --- a/browserplugins/browseraudiovideoplugin/src/BavpVolumeHandler.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browseraudiovideoplugin/src/BavpVolumeHandler.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -19,7 +19,7 @@ #include #include -#include +#include #include "BavpLogger.h" #include "BavpVolumeHandler.h" diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browsergpsplugin/group/GpsPluginEcom.mmp --- a/browserplugins/browsergpsplugin/group/GpsPluginEcom.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browsergpsplugin/group/GpsPluginEcom.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ #include #include -#include +#include TARGET npGpsPlugin.dll TARGETTYPE PLUGIN diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browsergpsplugin/inc/GpsPlugin.h --- a/browserplugins/browsergpsplugin/inc/GpsPlugin.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browsergpsplugin/inc/GpsPlugin.h Thu Dec 17 08:47:18 2009 +0200 @@ -20,9 +20,9 @@ #define GPSPLUGIN_H // INCLUDES -#include +#include #include -#include // For base class MPluginNotifier +#include // For base class MPluginNotifier // FORWARD DECLARATIONS class CGpsObserver; diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browsergpsplugin/src/GpsPluginEcomMain.cpp --- a/browserplugins/browsergpsplugin/src/GpsPluginEcomMain.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browsergpsplugin/src/GpsPluginEcomMain.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -20,7 +20,7 @@ // INCLUDE FILES #include "GpsPlugin.h" #include -#include +#include /*********************************************************/ diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browsersysteminfoplugin/group/SystemInfoPluginEcom.mmp --- a/browserplugins/browsersysteminfoplugin/group/SystemInfoPluginEcom.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browsersysteminfoplugin/group/SystemInfoPluginEcom.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ #include #include -#include +#include TARGET npSystemInfoPlugin.dll TARGETTYPE PLUGIN diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browsersysteminfoplugin/inc/SystemInfoMisc.h --- a/browserplugins/browsersysteminfoplugin/inc/SystemInfoMisc.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browsersysteminfoplugin/inc/SystemInfoMisc.h Thu Dec 17 08:47:18 2009 +0200 @@ -23,7 +23,7 @@ #include #include #include -#include +#include // FORWARD DECLARATIONS class CHWRMLight; diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browsersysteminfoplugin/inc/SystemInfoPlugin.h --- a/browserplugins/browsersysteminfoplugin/inc/SystemInfoPlugin.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browsersysteminfoplugin/inc/SystemInfoPlugin.h Thu Dec 17 08:47:18 2009 +0200 @@ -20,7 +20,7 @@ #define SYSTEMINFOPLUGIN_H // INCLUDES -#include +#include #include diff -r b57c5fc53578 -r 868cceedabd3 browserplugins/browsersysteminfoplugin/src/SystemInfoMain.cpp --- a/browserplugins/browsersysteminfoplugin/src/SystemInfoMain.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserplugins/browsersysteminfoplugin/src/SystemInfoMain.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include +#include #include "SystemInfoPlugin.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/BrowserAppDocument.h --- a/browserui/browser/BrowserAppInc/BrowserAppDocument.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/BrowserAppDocument.h Thu Dec 17 08:47:18 2009 +0200 @@ -21,7 +21,7 @@ #ifndef __BROWSERAPPDOCUMENT_H #define __BROWSERAPPDOCUMENT_H -#include "BrowserOverriddenSettings.h" +#include "browseroverriddensettings.h" #include "BrowserUtil.h" #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/BrowserAppUi.h --- a/browserui/browser/BrowserAppInc/BrowserAppUi.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/BrowserAppUi.h Thu Dec 17 08:47:18 2009 +0200 @@ -22,19 +22,19 @@ // INCLUDE FILES -#include +#include #include -#include // CHG! +#include // CHG! #include #include "ApiProvider.h" #include "BrowserBuild.h" #include "WmlBrowserBuild.h" -#include "RecentUrlStore.h" +#include "recenturlstore.h" -#include -#include "DownloadedContentHandler.h" +#include +#include "downloadedcontenthandler.h" #include "WindowInfoProvider.h" -#include "BrowserOverriddenSettings.h" +#include "browseroverriddensettings.h" // FORWARD DECLARATIONS class CBrowserViewBase; @@ -103,7 +103,7 @@ ~CBrowserAppUi(); public: - +#if defined(__S60_50__) /** * Handling the system Event. * @since Series 60 1.2 @@ -111,7 +111,7 @@ */ void HandleSystemEventL(const TWsEvent& aEvent); - +#endif /** * Get the active view. * @since Series 60 1.2 diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/BrowserContentView.h --- a/browserui/browser/BrowserAppInc/BrowserContentView.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/BrowserContentView.h Thu Dec 17 08:47:18 2009 +0200 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "BrowserAppViewBase.h" #include "BrowserGotoPane.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/BrowserDialogsProviderProxy.h --- a/browserui/browser/BrowserAppInc/BrowserDialogsProviderProxy.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/BrowserDialogsProviderProxy.h Thu Dec 17 08:47:18 2009 +0200 @@ -25,8 +25,8 @@ // User includes // System Includes -#include -#include +#include +#include #include // CONSTANTS diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/BrowserLoadObserver.h --- a/browserui/browser/BrowserAppInc/BrowserLoadObserver.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/BrowserLoadObserver.h Thu Dec 17 08:47:18 2009 +0200 @@ -22,8 +22,8 @@ #define BROWSERLOADOBSERVER_H // INCLUDES -#include -#include +#include +#include // FORWARD DECLARATIONS class MApiProvider; diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/BrowserPreferences.h --- a/browserui/browser/BrowserAppInc/BrowserPreferences.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/BrowserPreferences.h Thu Dec 17 08:47:18 2009 +0200 @@ -22,12 +22,12 @@ // INCLUDE FILES #include #include -#include +#include #include "Browser.hrh" #include "Preferences.h" #include #include "BrowserUiPrivateCRKeys.h" -#include +#include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/BrowserSoftkeysObserver.h --- a/browserui/browser/BrowserAppInc/BrowserSoftkeysObserver.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/BrowserSoftkeysObserver.h Thu Dec 17 08:47:18 2009 +0200 @@ -21,7 +21,7 @@ #define BROWSERSOFTKEYSOBSERVER_H // INCLUDES -#include +#include #include "WmlBrowserBuild.h" class CBrowserWindow; diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/BrowserSpecialLoadObserver.h --- a/browserui/browser/BrowserAppInc/BrowserSpecialLoadObserver.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/BrowserSpecialLoadObserver.h Thu Dec 17 08:47:18 2009 +0200 @@ -23,7 +23,7 @@ // INCLUDES #include -#include +#include #include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/BrowserWindow.h --- a/browserui/browser/BrowserAppInc/BrowserWindow.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/BrowserWindow.h Thu Dec 17 08:47:18 2009 +0200 @@ -26,10 +26,10 @@ #include #include "ApiProvider.h" #include "Preferences.h" -#include +#include #include "BrowserLoadObserver.h" #include "BrowserDialogsProviderProxy.h" -#include +#include // FORWARD DECLARATIONS class CBrCtlInterface; diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/BrowserWindowManager.h --- a/browserui/browser/BrowserAppInc/BrowserWindowManager.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/BrowserWindowManager.h Thu Dec 17 08:47:18 2009 +0200 @@ -25,7 +25,7 @@ #include "WmlBrowserBuild.h" #include "Preferences.h" #include -#include +#include #include "WindowObserver.h" // FORWARD DECLARATIONS @@ -77,7 +77,9 @@ const TDesC& aTargetName ); CBrowserWindow* CurrentWindow() const; - + + CBrowserWindowQue* CurrentWindowQue() const; + inline MApiProvider* ApiProvider() const; inline CBrowserContentView* ContentView() const; diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/CommonConstants.h --- a/browserui/browser/BrowserAppInc/CommonConstants.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/CommonConstants.h Thu Dec 17 08:47:18 2009 +0200 @@ -89,10 +89,10 @@ const TUint KCharacterSetIdentifierWindows874 = 0x101F854A; const TUint KCharacterSetIdentifierKoi8_r = 0x101f8778; // Russian const TUint KCharacterSetIdentifierKoi8_u = 0x101f8761; // Ukrainian -const TUint KCharacterSetIdentifierIscii = 0x1027508E; +const TUint KCharacterSetIdentifierIscii_temp = 0x1027508E; const TUint KCharacterSetIdentifierEucKr = 0x2000E526; // Korean -const TUint KCharacterSetIdentifierKsc5601 = 0x200113CD; // Korean +const TUint KCharacterSetIdentifierKsc5601_temp = 0x200113CD; // Korean const TUint KCharacterSetIdentifierAutomatic = 0x00; const TUint KCharacterSetIdentifierUCS2 = 0xffffffff; // dummy value this id is never checked diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/Display.h --- a/browserui/browser/BrowserAppInc/Display.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/Display.h Thu Dec 17 08:47:18 2009 +0200 @@ -22,7 +22,7 @@ #define MDISPLAY_H // INCLUDES -#include +#include // FORWARD DECLARATIONS diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppInc/Preferences.h --- a/browserui/browser/BrowserAppInc/Preferences.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppInc/Preferences.h Thu Dec 17 08:47:18 2009 +0200 @@ -29,7 +29,7 @@ #include "Browser.hrh" #include -#include +#include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserAppDocument.cpp --- a/browserui/browser/BrowserAppSrc/BrowserAppDocument.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserAppDocument.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -20,8 +20,8 @@ #include "BrowserAppDocument.h" #include "BrowserAppUi.h" -#include "FavouritesItem.h" -#include +#include "favouritesitem.h" +#include #include "CommonConstants.h" CBrowserAppDocument::CBrowserAppDocument(CEikApplication& aApp): CAknDocument(aApp) diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserAppEntryPoint.cpp --- a/browserui/browser/BrowserAppSrc/BrowserAppEntryPoint.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserAppEntryPoint.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -11,9 +11,9 @@ * * Contributors: * -* Description: +* Description: * Browser App Entry point -* +* * */ @@ -33,41 +33,54 @@ return new CBrowserApplication; } -EXPORT_C TInt UserHeap::SetupThreadHeap(TBool, SStdEpocThreadCreateInfo& aInfo) - { +// ----------------------------------------------------------------------------- +// SetupThreadHeap - Called for heap creation of thread in this process. +// This approach used to keep correct heap for pointers held in static data objects +// when they are destructed after E32Main() by OS. +// ----------------------------------------------------------------------------- +EXPORT_C TInt UserHeap::SetupThreadHeap(TBool aSubThread, SStdEpocThreadCreateInfo& aInfo) + { TInt r = KErrNone; if (!aInfo.iAllocator && aInfo.iHeapInitialSize>0) - { - // new heap required - RHeap* pH = NULL; - r = CreateThreadHeap(aInfo, pH); - if (r == KErrNone) - { // should happen for main thread, otherwise panic - RAllocator* oldAllocator = MemoryManager::SwitchToFastAllocator(); - } - } - else if (aInfo.iAllocator) - { - // sharing a heap - RAllocator* pA = aInfo.iAllocator; - pA->Open(); - User::SwitchAllocator(pA); - } + { + // new heap required + RHeap* pH = NULL; + r = CreateThreadHeap(aInfo, pH); + if (r == KErrNone && !aSubThread) + { + // main thread - new allocator created and set as default heap + MemoryManager::CreateFastAllocator(); + } + } + else if (aInfo.iAllocator) + { + // sharing a heap + RAllocator* pA = aInfo.iAllocator; + pA->Open(); + User::SwitchAllocator(pA); + } return r; - } + } +// ----------------------------------------------------------------------------- +// E32Main +// ----------------------------------------------------------------------------- GLDEF_C TInt E32Main() { ROomMonitorSession oomMs; - TInt r = oomMs.Connect(); - if (r == KErrNone) + TInt result = oomMs.Connect(); + if ( result == KErrNone ) { - r = oomMs.RequestFreeMemory(KFreeMemoryTarget); + result = oomMs.RequestFreeMemory( KFreeMemoryTarget ); oomMs.Close(); } + + // initialize MemmoryManager + MemoryManager::InitFastAllocator(); - return EikStart::RunApplication(NewApplication); + // run application event loop + return EikStart::RunApplication(NewApplication); } // End of File diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserAppUi.cpp --- a/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDES -#include +#include #include #include #include @@ -30,10 +30,10 @@ #include #include #include -#include "FavouritesFile.h" +#include "favouritesfile.h" #include #include -#include +#include #include #include #include @@ -46,20 +46,20 @@ #include #endif -#include +#include #include -#include "BrowserOverriddenSettings.h" +#include "browseroverriddensettings.h" #include "BrowserLauncherService.h" -#include "CookieManagerClient.h" +#include "cookiemanagerclient.h" #ifdef __SERIES60_HELP #include #endif //__SERIES60_HELP #include "BrowserAppDocument.h" -#include "DownloadedContentHandler.h" +#include "downloadedcontenthandler.h" #include "BrowserBmOTABinSender.h" #include "BrowserCommandLineParser.h" #include "BrowserApplication.h" @@ -78,11 +78,12 @@ #include "BrowserPreferences.h" #include "SessionAndSecurity.h" #include "BrowserUIVariant.hrh" +#include "BrowserWindowQueue.h" #include "Logger.h" #include -#include -#include "BrowserDialogsProvider.h" +#include +#include "browserdialogsprovider.h" #include "BrowserSoftkeysObserver.h" #include "BrowserLoadObserver.h" #include "BrowserSpecialLoadObserver.h" @@ -91,9 +92,9 @@ // Dialogs Provider -#include -#include -#include +#include +#include +#include // Multiple Windows #include "BrowserPopupEngine.h" @@ -3585,6 +3586,12 @@ //There are only two cases for closing window. One is user initialized and the //other is script initialized. For both cases, the window should be deleted. TBool forceDelete( ETrue ); + // this variable is useful to know if the window has a parent window which needs to be activated on closing current window + TBool parentPresent(EFalse); + if ( WindowMgr().CurrentWindowQue() && WindowMgr().CurrentWindowQue()->iParent ) + { + parentPresent = ETrue; + } // delete the current window by default if( aWindowId == 0 ) { @@ -3619,7 +3626,7 @@ if( winId > 0 ) // still remain a window to be activated { WindowMgr().SwitchWindowL( winId ); - if(CalledFromAnotherApp() && (!IsEmbeddedModeOn())) + if(CalledFromAnotherApp() && (!IsEmbeddedModeOn()) && !parentPresent) { SetCalledFromAnotherApp(EFalse); SendBrowserToBackground(); @@ -4088,7 +4095,7 @@ // --------------------------------------------------------- // CBrowserAppUi::HandleSystemEventL // --------------------------------------------------------- - +#if defined(__S60_50__) void CBrowserAppUi::HandleSystemEventL(const TWsEvent& aEvent) { @@ -4109,7 +4116,7 @@ // call base class implementation CAknAppUi::HandleSystemEventL(aEvent); } - +#endif // --------------------------------------------------------- // CBrowserAppUi::StartFetchHomePageL // --------------------------------------------------------- diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserAppViewBase.cpp --- a/browserui/browser/BrowserAppSrc/BrowserAppViewBase.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserAppViewBase.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -31,7 +31,7 @@ #include #include #include "BrowserUtil.h" -#include +#include // ================= MEMBER FUNCTIONS ======================= // --------------------------------------------------------- diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserContentView.cpp --- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -19,14 +19,14 @@ // INCLUDE FILES -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -71,7 +71,7 @@ #include "Preferences.h" #include "BrowserPreferences.h" #include "Display.h" -#include "FavouritesWapAp.h" +#include "favouriteswapap.h" #include "BrowserBookmarksModel.h" #include "BrowserDialogs.h" #include "BrowserUtil.h" @@ -81,14 +81,14 @@ #include "BrowserAdaptiveListPopup.h" #include "BrowserApplication.h" #include "logger.h" -#include "FavouritesFile.h" +#include "favouritesfile.h" #include "BrowserWindowManager.h" #include "BrowserWindow.h" #include "BrowserPopupEngine.h" -#include -#include -#include +#include +#include +#include #include #ifdef RD_SCALABLE_UI_V2 #include @@ -1038,6 +1038,7 @@ ApiProvider().Display().FSPaneOnL( ); ApiProvider().Display().SetGPRSIndicatorOnL(); + UpdateTitleL(ApiProvider()); ApiProvider().Display().RestoreTitleL(); StatusPane()->ApplyCurrentSettingsL(); if ( resIdChanged || sizeChangedCba || sizeChangedSP ) diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserContentViewToolbar.cpp --- a/browserui/browser/BrowserAppSrc/BrowserContentViewToolbar.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserContentViewToolbar.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -33,7 +33,7 @@ #include "BrowserUiVariant.hrh" #endif #include -#include +#include #include "BrowserAppUi.h" #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserDialogsProviderProxy.cpp --- a/browserui/browser/BrowserAppSrc/BrowserDialogsProviderProxy.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserDialogsProviderProxy.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -26,8 +26,8 @@ #include "logger.h" // System includes -#include -#include +#include +#include // CONSTANTS diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserDisplay.cpp --- a/browserui/browser/BrowserAppSrc/BrowserDisplay.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserDisplay.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include // For WLAN state checking diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp --- a/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -50,7 +50,7 @@ #include "BrowserAppUi.h" #include "BrowserUtil.h" #include "browser.hrh" -#include "FavouritesLimits.h" +#include "favouriteslimits.h" #include "BrowserAdaptiveListPopup.h" #include "BrowserContentView.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserLauncherService.cpp --- a/browserui/browser/BrowserAppSrc/BrowserLauncherService.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserLauncherService.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -20,7 +20,7 @@ // INCLUDES #include "BrowserLauncherService.h" -#include "BrowserOverriddenSettings.h" +#include "browseroverriddensettings.h" #include "LauncherServerCommands.hrh" #include "BrowserAppDocument.h" #include "BrowserAppUi.h" @@ -29,7 +29,7 @@ #include #include #include "BrowserSpecialLoadObserver.h" -#include "MConnection.h" +#include "mconnection.h" // ----------------------------------------------------------------------------- // CBrowserLauncherService::~CBrowserLauncherService() diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserLoadObserver.cpp --- a/browserui/browser/BrowserAppSrc/BrowserLoadObserver.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserLoadObserver.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -31,8 +31,8 @@ #include "BrowserDialogsProviderProxy.h" #include -#include -#include +#include +#include #ifdef I__LOG_EVENT_TIME // defines a local timer with name 'localTime' diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserPreferences.cpp --- a/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -41,7 +41,7 @@ #include #include -#include +#include #include "CommsModel.h" #include "ApiProvider.h" @@ -52,7 +52,7 @@ #include #include "commonconstants.h" #include "BrowserAppUi.h" -#include "BrowserOverriddenSettings.h" +#include "browseroverriddensettings.h" #include "SettingsContainer.h" // for TEncoding #include "BrowserUtil.h" // for Util::AllocateUrlWithSchemeL #include "logger.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserSpecialLoadObserver.cpp --- a/browserui/browser/BrowserAppSrc/BrowserSpecialLoadObserver.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserSpecialLoadObserver.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -37,7 +37,7 @@ #include #endif // __WINS__ #include -#include // for MConnection +#include // for MConnection #include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserUtil.cpp --- a/browserui/browser/BrowserAppSrc/BrowserUtil.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserUtil.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -23,8 +23,8 @@ #include "logger.h" #include -#include -#include +#include +#include #include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserWindow.cpp --- a/browserui/browser/BrowserAppSrc/BrowserWindow.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserWindow.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -20,13 +20,13 @@ // INCLUDE FILES -#include -#include +#include +#include #include "BrowserWindow.h" #include "BrowserContentView.h" #include "BrowserContentViewContainer.h" -#include "BrowserDialogsProvider.h" +#include "browserdialogsprovider.h" #include "BrowserDialogsProviderProxy.h" #include "BrowserSoftkeysObserver.h" #include "BrowserSpecialLoadObserver.h" @@ -38,8 +38,8 @@ #include "Logger.h" #include "BrowserDisplay.h" #include "BrowserPopupEngine.h" -#include -#include +#include +#include // for instantiating BrCtlInterface #include "CommonConstants.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserWindowManager.cpp --- a/browserui/browser/BrowserAppSrc/BrowserWindowManager.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserWindowManager.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -28,7 +28,7 @@ #include "Preferences.h" #include "Display.h" #include "ApiProvider.h" -#include +#include #include "BrowserUtil.h" #include #include @@ -282,6 +282,22 @@ return NULL; } } + +// ----------------------------------------------------------------------------- +// CBrowserWindowManager::CurrentWindowQue() +// ----------------------------------------------------------------------------- +// +CBrowserWindowQue* CBrowserWindowManager::CurrentWindowQue() const + { + if( iCurrentWindow ) + { + return iCurrentWindow; + } + else + { + return NULL; + } + } // ----------------------------------------------------------------------------- // CBrowserWindowManager::GetWindowInfoL() diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserWindowSelectionContainer.cpp --- a/browserui/browser/BrowserAppSrc/BrowserWindowSelectionContainer.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserWindowSelectionContainer.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -34,9 +34,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/BrowserWindowSelectionView.cpp --- a/browserui/browser/BrowserAppSrc/BrowserWindowSelectionView.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/BrowserWindowSelectionView.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include "BrowserAppUi.h" #include "CommonConstants.h" #include "BrowserWindowSelectionView.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/BrowserAppSrc/SessionAndSecurity.cpp --- a/browserui/browser/BrowserAppSrc/SessionAndSecurity.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/BrowserAppSrc/SessionAndSecurity.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -23,7 +23,7 @@ #include "Browser.hrh" #include #include "SessionAndSecurity.h" -#include +#include #include #include #include @@ -33,7 +33,7 @@ #include "BrowserUtil.h" #include "ApiProvider.h" #include // for TCertInfo -#include +#include // CONSTANTS const TInt KWmlSessionInfoMaxLength = 1000; diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesInc/BrowserBookmarksEditDialog.h --- a/browserui/browser/FavouritesInc/BrowserBookmarksEditDialog.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesInc/BrowserBookmarksEditDialog.h Thu Dec 17 08:47:18 2009 +0200 @@ -24,7 +24,7 @@ // INCLUDE FILES #include -// #include +// #include #include // FORWARD DECLARATION diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesInc/BrowserBookmarksEditFormApModel.h --- a/browserui/browser/FavouritesInc/BrowserBookmarksEditFormApModel.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesInc/BrowserBookmarksEditFormApModel.h Thu Dec 17 08:47:18 2009 +0200 @@ -25,7 +25,7 @@ #include #include -#include +#include // FORWARD DECLARATION diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesInc/BrowserBookmarksOrder.h --- a/browserui/browser/FavouritesInc/BrowserBookmarksOrder.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesInc/BrowserBookmarksOrder.h Thu Dec 17 08:47:18 2009 +0200 @@ -15,7 +15,7 @@ * */ #include -#include +#include class CBrowserBookmarksOrder : public MFavouritesItemData, public CBase diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesInc/BrowserBookmarksView.h --- a/browserui/browser/FavouritesInc/BrowserBookmarksView.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesInc/BrowserBookmarksView.h Thu Dec 17 08:47:18 2009 +0200 @@ -25,8 +25,8 @@ #include "BrowserFavouritesView.h" #include "BrowserBookmarksGotoPane.h" #include "Preferences.h" -#include -#include +#include +#include #include @@ -271,7 +271,7 @@ * @param aFolder Folder which contains the items. * @return List of items. Pushed on the cleanup stack. */ - virtual CFavouritesItemList* GetItemsL( TInt aFolder ); + virtual CFavouritesItemList* GetItemsLC( TInt aFolder ); /** * Some displayed data has changed (Favourites database, AP-s, etc). diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesInc/BrowserFavouritesModel.h --- a/browserui/browser/FavouritesInc/BrowserFavouritesModel.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesInc/BrowserFavouritesModel.h Thu Dec 17 08:47:18 2009 +0200 @@ -24,10 +24,10 @@ // INCLUDES #include -#include +#include #include "BrowserBookmarksOrder.h" -#include "FavouritesDb.h" -#include "FavouritesFile.h" +#include "favouritesdb.h" +#include "favouritesfile.h" #include "ApiProvider.h" // FORWARD DECLARATION diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesInc/BrowserFavouritesView.h --- a/browserui/browser/FavouritesInc/BrowserFavouritesView.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesInc/BrowserFavouritesView.h Thu Dec 17 08:47:18 2009 +0200 @@ -29,7 +29,7 @@ #include "CommandVisibility.h" #include "CommsModel.h" #include "BrowserFavouritesModel.h" -#include "FavouritesLimits.h" +#include "favouriteslimits.h" // FORWARD DECLARATION class CFavouritesItemList; @@ -220,7 +220,7 @@ * @param aFolder Folder which contains the items. * @return List of items. Pushed on the cleanup stack. */ - virtual CFavouritesItemList* GetItemsL( TInt aFolder ); + virtual CFavouritesItemList* GetItemsLC( TInt aFolder ); public: @@ -569,9 +569,6 @@ TBool iSaveStateOnDeactivate; CBrowserFavouritesListboxState* iSavedListboxState; - - //Added one variable to hold the data retrieved from database - CFavouritesItemList* iBookmarkitems; }; #include "BrowserFavouritesView.inl" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserAdaptiveListPopup.cpp --- a/browserui/browser/FavouritesSrc/BrowserAdaptiveListPopup.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserAdaptiveListPopup.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -24,7 +24,7 @@ #include #include #include -#include "RecentUrlStore.h" +#include "recenturlstore.h" #include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp --- a/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "BrowserBookmarksView.h" @@ -43,7 +43,7 @@ #endif // __SERIES60_HELP #include "Logger.h" #include "e32event.h" -#include "BrowserUiSDKCRKeys.h" +#include "browseruisdkcrkeys.h" #include // CONSTANTS @@ -427,7 +427,7 @@ } else { - if ( iSearchPane ) + if ( iSearchPane && iSearchPaneActive) { // Process separately for Search Feature if ( iGotoPaneActive ) diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserBookmarksEditDialog.cpp --- a/browserui/browser/FavouritesSrc/BrowserBookmarksEditDialog.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserBookmarksEditDialog.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserBookmarksGotoPane.cpp --- a/browserui/browser/FavouritesSrc/BrowserBookmarksGotoPane.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserBookmarksGotoPane.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserBookmarksListboxIconHandler.cpp --- a/browserui/browser/FavouritesSrc/BrowserBookmarksListboxIconHandler.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserBookmarksListboxIconHandler.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include "BrowserBookmarksListboxIconHandler.h" #include "BrowserFavouritesListbox.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserBookmarksModel.cpp --- a/browserui/browser/FavouritesSrc/BrowserBookmarksModel.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserBookmarksModel.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -23,8 +23,8 @@ #include "BrowserBookmarksModel.h" #include "BrowserUtil.h" #include -#include -#include +#include +#include #include #include #include "ApiProvider.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp --- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -17,8 +17,8 @@ // INCLUDE FILES -#include -#include +#include +#include #include #include #include @@ -29,12 +29,12 @@ #endif #include -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -61,7 +61,7 @@ #include "CommandVisibility.h" #include "BrowserBmOTABinSender.h" #include "CommsModel.h" -#include +#include #include "BrowserUiVariant.hrh" #include "BrowserWindowManager.h" #include "BrowserWindow.h" @@ -656,7 +656,7 @@ iDomainFolderName = NULL; CFavouritesItemList* items = - GetItemsL( KFavouritesAdaptiveItemsFolderUid ); + GetItemsLC( KFavouritesAdaptiveItemsFolderUid ); TInt indexToHighlight = 0; for ( TInt i = 0; i < items->Count(); i++ ) @@ -667,7 +667,7 @@ } } - delete items; + CleanupStack::PopAndDestroy(); // items CleanupStack::PopAndDestroy(); // domainFolderNameToHighlight HBufC* title; @@ -1122,7 +1122,8 @@ if ( Model().BeginL( /*aWrite=*/ETrue, /*aDbErrorNote*/ EFalse ) == KErrNone ) { - iBookmarkitems = GetItemsL( KFavouritesRootUid ); + CFavouritesItemList* items = GetItemsLC( KFavouritesRootUid ); + CleanupStack::PopAndDestroy(); Model().CommitL(); } @@ -1130,8 +1131,8 @@ //thread, its important to refresh when the thread notifies the fresh data. //Call to GetItemsLC above, which inturn calls ManualBMSortL will set iRefresh to false //Make it true so that latest FavIcon db info is shown - //Removed the iRefresh becoming ETrue, move to RefreshL - + iRefresh = ETrue; + if (iPenEnabled) { Toolbar()->SetToolbarObserver(this); @@ -1881,7 +1882,7 @@ // CBrowserBookmarksView::GetItemsL // ---------------------------------------------------------------------------- // -CFavouritesItemList* CBrowserBookmarksView::GetItemsL( TInt aFolder ) +CFavouritesItemList* CBrowserBookmarksView::GetItemsLC( TInt aFolder ) { PERFLOG_LOCAL_INIT PERFLOG_STOPWATCH_START @@ -1889,6 +1890,7 @@ if ( iInAdaptiveBookmarksFolder ) { items= new (ELeave) CFavouritesItemList(); + CleanupStack::PushL(items);//1 CDesCArrayFlat* aditems = new ( ELeave ) CDesCArrayFlat( KBrowserDesCArrayGranularity ); aditems->Reset(); @@ -1920,6 +1922,7 @@ else { items = new (ELeave) CFavouritesItemList(); + CleanupStack::PushL( items ); Model().Database().GetAll( *items, aFolder ); TInt aBMPosition = KAdaptiveBookmarksFirstPositionInBMView; // Adaptive BM folder is first if there is no startpage if ( aFolder == KFavouritesRootUid ) diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFaviconHandler.cpp --- a/browserui/browser/FavouritesSrc/BrowserFaviconHandler.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFaviconHandler.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -23,11 +23,11 @@ #include "ApiProvider.h" #include "BrowserUtil.h" #include -#include +#include #include #include -#include -#include +#include +#include // number of favicons to get before redrawing const TInt KNumFaviconsToRedraw = 3 ; diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesContainer.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesContainer.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesContainer.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesFolderListboxIconHandler.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesFolderListboxIconHandler.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesFolderListboxIconHandler.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -20,7 +20,7 @@ // INCLUDE FILES #include -#include +#include #include "BrowserFavouritesFolderListboxIconHandler.h" #include "BrowserFavouritesIconIndexArray.h" #include "BrowserFavouritesView.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesFolderSelector.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesFolderSelector.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesFolderSelector.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include "BrowserFavouritesFolderSelector.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesIncrementalDelete.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesIncrementalDelete.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesIncrementalDelete.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include -#include +#include #include #include "BrowserFavouritesIncrementalDelete.h" #include "BrowserFavouritesModel.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesIncrementalMove.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesIncrementalMove.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesIncrementalMove.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include -#include -#include +#include +#include #include #include "BrowserFavouritesIncrementalMove.h" #include "BrowserFavouritesModel.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesListbox.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesListbox.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesListbox.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -24,11 +24,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include "BrowserFavouritesListbox.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesListboxIconHandler.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesListboxIconHandler.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesListboxIconHandler.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -20,7 +20,7 @@ // INCLUDE FILES #include -#include +#include #include "BrowserFavouritesListboxIconHandler.h" #include "BrowserFavouritesIconIndexArray.h" #include "BrowserFavouritesListbox.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesListboxItemDrawer.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesListboxItemDrawer.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesListboxItemDrawer.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include "BrowserFavouritesListboxItemDrawer.h" #include "BrowserFavouritesListboxModel.h" -#include -#include +#include +#include //================== MEMBER FUNCTIONS ========================================= diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesListboxModel.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesListboxModel.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesListboxModel.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include "BrowserFavouritesListboxModel.h" #include "BrowserFavouritesIconIndexArray.h" #include "BrowserUtil.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesListboxState.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesListboxState.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesListboxState.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include "BrowserFavouritesListboxState.h" -#include +#include // ================= MEMBER FUNCTIONS ======================= diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesModel.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesModel.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesModel.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -24,18 +24,18 @@ #include #include // This contains CAknDialog #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include "BrowserFavouritesModel.h" #include "BrowserFavouritesModelObserver.h" #include "BrowserUtil.h" #include "BrowserDialogs.h" -#include "BrowserDialogsProvider.h" +#include "browserdialogsprovider.h" #include "BrowserFavouritesView.h" #include "Browser.hrh" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -30,11 +30,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -241,7 +241,7 @@ iIsActivated( EFalse ), iLastSelection( 0 ), iUpdatePending( EFalse ), - iRefresh( EFalse ) + iRefresh( ETrue ) { } @@ -259,12 +259,13 @@ } // --------------------------------------------------------- -// CBrowserFavouritesView::GetItemsL +// CBrowserFavouritesView::GetItemsLC // --------------------------------------------------------- // -CFavouritesItemList* CBrowserFavouritesView::GetItemsL( TInt aFolder ) +CFavouritesItemList* CBrowserFavouritesView::GetItemsLC( TInt aFolder ) { CFavouritesItemList* items = new (ELeave) CFavouritesItemList(); + CleanupStack::PushL( items ); iModel->Database().GetAll( *items, aFolder ); iModel->SortL( *items ); return items; @@ -412,8 +413,6 @@ // not activated (and tries to refresh); but this "activated-check" is // made here, not in Bookmarks View, because it makes things more safe and // "future-proof".) - //Making iRefresh ETrue - iRefresh = ETrue; if ( iIsActivated ) { iUpdatePending = ETrue; @@ -773,16 +772,7 @@ if (count ==1) { - CFavouritesItemList* allItems=NULL; - if(iRefresh) - { - allItems = GetItemsL( KFavouritesRootUid ); - CleanupStack::PushL(allItems); - } - else - { - allItems = iBookmarkitems; - } + CFavouritesItemList* allItems = GetItemsLC( KFavouritesRootUid ); item = items->At(0); iPreferredHighlightUid = item->Uid(); TInt index = allItems->UidToIndex(iPreferredHighlightUid); @@ -1177,16 +1167,8 @@ listbox->View()->SetDisableRedraw( ETrue ); // Change the data. - CFavouritesItemList* items = NULL; - if (iRefresh) - { - items = GetItemsL( aFolder ); - CleanupStack::PushL(items); - } - else - { - items = iBookmarkitems; - } + CFavouritesItemList* items = GetItemsLC( aFolder ); + // Next take localized item names for seamless links. TInt contextId; TInt resId = 0; @@ -1271,10 +1253,7 @@ // Set Search item to italics font iContainer->Listbox()->ItalicizeRowItemL(0); } - if(iRefresh) - { - CleanupStack::Pop(); // items: passing ownership to listbox. - } + CleanupStack::Pop(); // items: passing ownership to listbox. iContainer->Listbox()->SetDataL ( items, /*ApiProvider().CommsModel(),*/ aKeepState ); CAknColumnListBoxView *aknview = STATIC_CAST(CAknColumnListBoxView*, iContainer->Listbox()->View() ); diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FeedsInc/FeedsClientUtilities.h --- a/browserui/browser/FeedsInc/FeedsClientUtilities.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FeedsInc/FeedsClientUtilities.h Thu Dec 17 08:47:18 2009 +0200 @@ -20,15 +20,15 @@ #define FEEDS_CLIENT_UTILITIES_H // INCLUDES -#include +#include #include "Preferences.h" #include "FeedsWaitDialog.h" #include "FeedsFileSearchAgent.h" #include "CommonConstants.h" -#include "FeedsInterface.h" -#include "FeedsMap.h" -#include "Transaction.h" +#include "feedsinterface.h" +#include "feedsmap.h" +#include "transaction.h" // CONSTANTS // MACROS diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FeedsInc/FeedsFeedContainer.h --- a/browserui/browser/FeedsInc/FeedsFeedContainer.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FeedsInc/FeedsFeedContainer.h Thu Dec 17 08:47:18 2009 +0200 @@ -24,7 +24,7 @@ #include #include #include -#include +#include // CONSTANTS diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FeedsSrc/FeedsClientUtilities.cpp --- a/browserui/browser/FeedsSrc/FeedsClientUtilities.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FeedsSrc/FeedsClientUtilities.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -28,10 +28,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FeedsSrc/FeedsFeedContainer.cpp --- a/browserui/browser/FeedsSrc/FeedsFeedContainer.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FeedsSrc/FeedsFeedContainer.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -36,16 +36,16 @@ #include #include "FeedsFeedContainer.h" #include "FeedsFeedView.h" -#include "XmlEncoding.h" +#include "xmlencoding.h" #include "ApiProvider.h" #include "BrowserSpecialLoadObserver.h" #include "Display.h" #include "BrowserWindowManager.h" #include "BrowserWindow.h" #include "BrowserAppUi.h" -#include -#include -#include +#include +#include +#include #include "eikon.hrh" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FeedsSrc/FeedsFeedView.cpp --- a/browserui/browser/FeedsSrc/FeedsFeedView.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FeedsSrc/FeedsFeedView.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -29,8 +29,8 @@ #include "Browser.hrh" #include #include "BrowserUtil.h" -#include -#include +#include +#include #include "FeedsFeedContainer.h" #include "FeedsFeedView.h" @@ -172,7 +172,7 @@ break; case EFeedsSeeFullStory: - iApiProvider.FeedsClientUtilities().LoadUrlL(iContainer->GetItemUrl()); + iContainer->iBrowserControl->HandleCommandL(TBrCtlDefs::ECommandOpen); break; default: diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FeedsSrc/FeedsFolderContainer.cpp --- a/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -41,13 +41,13 @@ #include "Browser.hrh" #include #include -#include -#include +#include +#include -#include -#include +#include +#include -#include +#include #include "FeedsFolderContainer.h" #include "FeedsFolderView.h" #include "ApiProvider.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FeedsSrc/FeedsFolderView.cpp --- a/browserui/browser/FeedsSrc/FeedsFolderView.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FeedsSrc/FeedsFolderView.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -31,8 +31,8 @@ #include "BrowserAppUi.h" #include "CommonConstants.h" -#include -#include +#include +#include #include "FeedsFolderContainer.h" #include "FeedsFolderView.h" #include "Display.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FeedsSrc/FeedsTopicContainer.cpp --- a/browserui/browser/FeedsSrc/FeedsTopicContainer.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FeedsSrc/FeedsTopicContainer.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -39,9 +39,9 @@ #include #include "Browser.hrh" #include -#include -#include -#include +#include +#include +#include #include "FeedsTopicContainer.h" #include "FeedsTopicView.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/FeedsSrc/FeedsTopicView.cpp --- a/browserui/browser/FeedsSrc/FeedsTopicView.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/FeedsSrc/FeedsTopicView.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -26,8 +26,8 @@ #include "Browser.hrh" #include -#include -#include +#include +#include #include "BrowserAppUi.h" #include "CommonConstants.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/Group/BrowserCommon.mmpi --- a/browserui/browser/Group/BrowserCommon.mmpi Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/Group/BrowserCommon.mmpi Thu Dec 17 08:47:18 2009 +0200 @@ -15,7 +15,7 @@ * */ #include -#include +#include TARGETTYPE exe diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/Group/BrowserNG.mmp --- a/browserui/browser/Group/BrowserNG.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/Group/BrowserNG.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ */ #include -#include +#include TARGET BrowserNG.exe UID 0x100039CE 0x10008D39 diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/Group/bld.inf --- a/browserui/browser/Group/bld.inf Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/Group/bld.inf Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ */ #include -#include "../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../../../mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh" PRJ_PLATFORMS @@ -30,6 +30,32 @@ PRJ_EXPORTS #ifdef __S60_32__ ../rom/browser_stub_32.sis /epoc32/release/armv5/urel/browser_stub.sis +../data/qgn_indi_browser_bm_tb_new.svg /epoc32/s60/icons/qgn_indi_browser_bm_tb_new.svg +../data/qgn_indi_browser_feeds_tb_back_to_web.svg /epoc32/s60/icons/qgn_indi_browser_feeds_tb_back_to_web.svg +../data/qgn_indi_browser_feeds_tb_next.svg /epoc32/s60/icons/qgn_indi_browser_feeds_tb_next.svg +../data/qgn_indi_browser_feeds_tb_open_detail.svg /epoc32/s60/icons/qgn_indi_browser_feeds_tb_open_detail.svg +../data/qgn_indi_browser_feeds_tb_open_full.svg /epoc32/s60/icons/qgn_indi_browser_feeds_tb_open_full.svg +../data/qgn_indi_browser_feeds_tb_open_topic.svg /epoc32/s60/icons/qgn_indi_browser_feeds_tb_open_topic.svg +../data/qgn_indi_browser_feeds_tb_previous.svg /epoc32/s60/icons/qgn_indi_browser_feeds_tb_previous.svg +../data/qgn_indi_browser_feeds_tb_update.svg /epoc32/s60/icons/qgn_indi_browser_feeds_tb_update.svg +../data/qgn_indi_browser_feeds_tb_update_all.svg /epoc32/s60/icons/qgn_indi_browser_feeds_tb_update_all.svg +../data/qgn_indi_browser_tb_delete.svg /epoc32/s60/icons/qgn_indi_browser_tb_delete.svg +../data/qgn_indi_browser_tb_find_kw_next.svg /epoc32/s60/icons/qgn_indi_browser_tb_find_kw_next.svg +../data/qgn_indi_browser_tb_find_kw_prev.svg /epoc32/s60/icons/qgn_indi_browser_tb_find_kw_prev.svg +../data/qgn_indi_browser_tb_history_back.svg /epoc32/s60/icons/qgn_indi_browser_tb_history_back.svg +../data/qgn_indi_browser_tb_history_fw.svg /epoc32/s60/icons/qgn_indi_browser_tb_history_fw.svg +../data/qgn_indi_browser_tb_view_images.svg /epoc32/s60/icons/qgn_indi_browser_tb_view_images.svg +../data/qgn_indi_browser_tb_view_pages.svg /epoc32/s60/icons/qgn_indi_browser_tb_view_pages.svg +../data/qgn_indi_button_exit_fs.svg /epoc32/s60/icons/qgn_indi_button_exit_fs.svg +../data/qgn_prop_file_rss_error.svg /epoc32/s60/icons/qgn_prop_file_rss_error.svg +../data/qgn_prop_folder_rss_error.svg /epoc32/s60/icons/qgn_prop_folder_rss_error.svg + +../data/A_H/qgn_indi_browser_tb_back.bmp /epoc32/s60/icons/A_H/qgn_indi_browser_tb_back.bmp +../data/A_H/qgn_indi_browser_tb_back_mask_soft.bmp /epoc32/s60/icons/A_H/qgn_indi_browser_tb_back_mask_soft.bmp +../data/A_H/qgn_indi_browser_tb_rss.bmp /epoc32/s60/icons/A_H/qgn_indi_browser_tb_rss.bmp +../data/A_H/qgn_indi_browser_tb_rss_mask_soft.bmp /epoc32/s60/icons/A_H/qgn_indi_browser_tb_rss_mask_soft.bmp +../data/A_H/qgn_prop_folder_rss.svg /epoc32/s60/icons/A_H/qgn_prop_folder_rss.svg +../data/A_H/qgn_prop_folder_rss_error.svg /epoc32/s60/icons/A_H/qgn_prop_folder_rss_error.svg #else ../rom/browser_stub.sis /epoc32/release/armv5/urel/browser_stub.sis #endif diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/Launcher2/group/BrowserLauncher.mmp --- a/browserui/browser/Launcher2/group/BrowserLauncher.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/Launcher2/group/BrowserLauncher.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -16,7 +16,7 @@ */ #include -#include +#include TARGET BrowserLauncher.dll TARGETTYPE dll diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/Launcher2/src/BrowserLauncher.cpp --- a/browserui/browser/Launcher2/src/BrowserLauncher.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/Launcher2/src/BrowserLauncher.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -18,19 +18,19 @@ // INCLUDE FILES -#include "BrowserLauncher.h" +#include "browserlauncher.h" #include "BrowserLauncherExtension.h" #include "logger.h" #include "BrowserUiPrivateCRKeys.h" -#include "BrowserOverriddenSettings.h" +#include "browseroverriddensettings.h" #include "Browser.hrh" -#include // Context Id:s +#include // Context Id:s #include #include #include #include -#include +#include // CONSTANTS const TInt KBrowserAppUid = 0x10008D39; diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/Launcher2/src/BrowserLauncherExtension.cpp --- a/browserui/browser/Launcher2/src/BrowserLauncherExtension.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/Launcher2/src/BrowserLauncherExtension.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -18,11 +18,11 @@ // INCLUDE FILES -#include "BrowserLauncher.h" +#include "browserlauncher.h" #include "BrowserLauncherExtension.h" #include "logger.h" -#include "DownloadedContentHandler.h" -#include // Context Id:s +#include "downloadedcontenthandler.h" +#include // Context Id:s #include #include diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/Launcher2/src/LauncherServerBase.cpp --- a/browserui/browser/Launcher2/src/LauncherServerBase.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/Launcher2/src/LauncherServerBase.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -22,8 +22,8 @@ #include "LauncherClientService.h" #include "LauncherServerBase.h" #include "LauncherServerCommands.hrh" -#include "BrowserOverriddenSettings.h" -#include "BrowserLauncher.h" +#include "browseroverriddensettings.h" +#include "browserlauncher.h" #include "BrowserAppDocument.h" #include "BrowserAppUi.h" #include "eikenv.h" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/Rom/Browser_stub_32.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/Rom/Browser_stub_32.pkg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,165 @@ +; +; 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 "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 + +;Header +#{"Web Browser"},(0x10008D39),7,1,0, TYPE=SA + +;Localised Vendor name +%{"Nokia"} + +;Unique Vendor name +:"Nokia" + +""-"z:\RESOURCE\APPS\BrowserAudioVideoPlugin_aif.mif" +""-"z:\RESOURCE\APPS\VideoServices_AIF.MIF" +""-"z:\RESOURCE\APPS\browser.mif" +""-"z:\RESOURCE\APPS\browserng_aif.mif" +""-"z:\RESOURCE\APPS\connman.mif" +""-"z:\RESOURCE\APPS\downloadmgruilib.mif" +""-"z:\RESOURCE\APPS\operatormenu_aif.mif" +""-"z:\RESOURCE\APPS\pushmtm.mif" +""-"z:\RESOURCE_FILES_DIR\WidgetMenu.R*" +""-"z:\Resource\APPS\webkiticons.mif" +""-"z:\Resource\APPS\webkitutilsicons.mif" +""-"z:\Resource\Plugins\CodRecog.rsc" +""-"z:\Resource\Plugins\CookieFilter.rsc" +""-"z:\Resource\Plugins\DdRecog.rsc" +""-"z:\Resource\Plugins\DeflateFilter.rsc" +""-"z:\Resource\Plugins\HttpFilterAcceptHeader.rsc" +""-"z:\Resource\Plugins\HttpFilterAuthentication.rsc" +""-"z:\Resource\Plugins\HttpFilterCache.rsc" +""-"z:\Resource\Plugins\HttpFilterPipeliningConfig.rsc" +""-"z:\Resource\Plugins\PushMtmPushContentHandler.rsc" +""-"z:\Resource\Plugins\PushMtmWhiteListAdapter.rsc" +""-"z:\Resource\Plugins\SchemeDispatcher.rsc" +""-"z:\Resource\Plugins\WidgetInstallerUI.rsc" +""-"z:\Resource\Plugins\WidgetRecognizer.rsc" +""-"z:\Resource\Plugins\httpfilterIop.rsc" +""-"z:\Resource\Plugins\httpfilterconnhandler.rsc" +""-"z:\Resource\Plugins\httpfilterproxy.rsc" +""-"z:\Resource\Plugins\memoryplugin.rsc" +""-"z:\Resource\Plugins\npBrowserAudioVideoPlugin.rsc" +""-"z:\Resource\Plugins\npGpsPlugin.rsc" +""-"z:\Resource\Plugins\npSystemInfoPlugin.rsc" +""-"z:\Resource\Plugins\uaproffilter.rsc" +""-"z:\Resource\Plugins\widgetmemoryplugin.rsc" +""-"z:\Resource\WidgetInstallerUI.R*" +""-"z:\private\10003a3f\import\apps\BrowserNG_reg.rsc" +""-"z:\private\10003a3f\import\apps\CodViewer_reg.rsc" +""-"z:\private\10003a3f\import\apps\DdViewer_reg.rsc" +""-"z:\private\10003a3f\import\apps\Operatormenu_reg.rsc" +""-"z:\private\10003a3f\import\apps\PushViewer_reg.rsc" +""-"z:\private\10003a3f\import\apps\RoapApp_reg.rsc" +""-"z:\private\10003a3f\import\apps\SchemeApp_reg.rsc" +""-"z:\private\10003a3f\import\apps\VideoServices_reg.rsc" +""-"z:\private\10003a3f\import\apps\WidgetUi_reg.rsc" +""-"z:\resource\AiwBrowserProvider.R*" +""-"z:\resource\BrowserAudioVideoPlugin.R*" +""-"z:\resource\BrowserDialogsProvider.R*" +""-"z:\resource\CodUi.R*" +""-"z:\resource\ConnectionManager.R*" +""-"z:\resource\DownloadMgrUiLib.R*" +""-"z:\resource\apps\BrowserNG.R*" +""-"z:\resource\apps\CodViewer.R*" +""-"z:\resource\apps\DdViewer.R*" +""-"z:\resource\apps\Operatormenu.R*" +""-"z:\resource\apps\PushViewer.R*" +""-"z:\resource\apps\RoapApp.R*" +""-"z:\resource\apps\SchemeApp.R*" +""-"z:\resource\apps\VideoServices.R*" +""-"z:\resource\apps\WidgetUi.R*" +""-"z:\resource\apps\schemeapp_aif.mif" +""-"z:\resource\browsertelservice.R*" +""-"z:\resource\messaging\PushMtmUi.R*" +""-"z:\resource\messaging\mtm\PushRegistry.R*" +""-"z:\resource\plugins\AiwBrowserProvider.rsc" +""-"z:\resource\webkit.R*" +""-"z:\resource\webkitutils.R*" +""-"z:\sys\bin\AiwBrowserProvider.dll" +""-"z:\sys\bin\BrowserCache.dll" +""-"z:\sys\bin\BrowserLauncher.dll" +""-"z:\sys\bin\BrowserNG.exe" +""-"z:\sys\bin\BrowserTelService.dll" +""-"z:\sys\bin\CodDownload.dll" +""-"z:\sys\bin\CodEng.dll" +""-"z:\sys\bin\CodRecog.dll" +""-"z:\sys\bin\CodUi.dll" +""-"z:\sys\bin\CodViewer.exe" +""-"z:\sys\bin\ConnectionManager.dll" +""-"z:\sys\bin\CookieServer.exe" +""-"z:\sys\bin\DdRecog.dll" +""-"z:\sys\bin\DdViewer.exe" +""-"z:\sys\bin\DeflateFilter.DLL" +""-"z:\sys\bin\DownloadMgr.dll" +""-"z:\sys\bin\DownloadMgrServer.exe" +""-"z:\sys\bin\DownloadMgrUiLib.dll" +""-"z:\sys\bin\FavouritesEngine.dll" +""-"z:\sys\bin\FavouritesSrv.exe" +""-"z:\sys\bin\FeedsServer.exe" +""-"z:\sys\bin\FeedsServerClient.dll" +""-"z:\sys\bin\HttpCacheManager.dll" +""-"z:\sys\bin\HttpDMServEng.dll" +""-"z:\sys\bin\HttpFilterAcceptHeader.dll" +""-"z:\sys\bin\HttpFilterAuthentication.dll" +""-"z:\sys\bin\HttpFilterCache.dll" +""-"z:\sys\bin\HttpFilterCommon.dll" +""-"z:\sys\bin\HttpFilterPipeliningConfig.dll" +""-"z:\sys\bin\JavaScriptCore.DLL" +""-"z:\sys\bin\MemMan.dll" +""-"z:\sys\bin\MultipartParser.dll" +""-"z:\sys\bin\OperatorMenu.exe" +""-"z:\sys\bin\PushMtmCliSrv.dll" +""-"z:\sys\bin\PushMtmPushContentHandler.dll" +""-"z:\sys\bin\PushMtmUi.dll" +""-"z:\sys\bin\PushMtmUtil.dll" +""-"z:\sys\bin\PushMtmWhiteListAdapter.dll" +""-"z:\sys\bin\PushViewer.exe" +""-"z:\sys\bin\RECENTURLSTORE.DLL" +""-"z:\sys\bin\RoapApp.exe" +""-"z:\sys\bin\SchemeApp.exe" +""-"z:\sys\bin\SchemeDispatcher.dll" +""-"z:\sys\bin\VideoServices.exe" +""-"z:\sys\bin\WidgetBackupRestore.exe" +""-"z:\sys\bin\WidgetInstaller.dll" +""-"z:\sys\bin\WidgetInstallerUI.dll" +""-"z:\sys\bin\WidgetRecognizer.DLL" +""-"z:\sys\bin\WidgetRegistry.exe" +""-"z:\sys\bin\WidgetRegistryClient.dll" +""-"z:\sys\bin\WidgetUi.exe" +""-"z:\sys\bin\browserdialogsprovider.dll" +""-"z:\sys\bin\browserengine.dll" +""-"z:\sys\bin\cXmlParser.dll" +""-"z:\sys\bin\cookiefilter.dll" +""-"z:\sys\bin\cookiemanager.dll" +""-"z:\sys\bin\httpfilterIop.dll" +""-"z:\sys\bin\httpfilterconnhandler.dll" +""-"z:\sys\bin\httpfilterproxy.dll" +""-"z:\sys\bin\memoryplugin.DLL" +""-"z:\sys\bin\npBrowserAudioVideoPlugin.dll" +""-"z:\sys\bin\npGpsPlugin.dll" +""-"z:\sys\bin\npSystemInfoPlugin.dll" +""-"z:\sys\bin\npscript.dll" +""-"z:\sys\bin\pagescaler.dll" +""-"z:\sys\bin\uaproffilter.dll" +""-"z:\sys\bin\webkitutils.dll" +""-"z:\sys\bin\webutils.dll" +""-"z:\sys\bin\widgetengine.dll" +""-"z:\sys\bin\widgetlauncher.exe" +""-"z:\sys\bin\widgetmemoryplugin.DLL" +""-"z:\sys\bin\wmlEngine.dll" diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/Rom/Browser_stub_32.sis Binary file browserui/browser/Rom/Browser_stub_32.sis has changed diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/SettingsInc/BrowserUiPrivateCRKeys.h --- a/browserui/browser/SettingsInc/BrowserUiPrivateCRKeys.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/SettingsInc/BrowserUiPrivateCRKeys.h Thu Dec 17 08:47:18 2009 +0200 @@ -17,7 +17,7 @@ #ifndef BROWSERUIPRIVATECRKEYS_H #define BROWSERUIPRIVATECRKEYS_H -#include +#include // Indicates whether to show connection dialogs or not. diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/SettingsSrc/SettingsContainer.cpp --- a/browserui/browser/SettingsSrc/SettingsContainer.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/SettingsSrc/SettingsContainer.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include @@ -60,10 +60,10 @@ #include "BrowserWindowManager.h" #include "BrowserWindow.h" // Browser as a plugin -#include -#include - -#include +#include +#include + +#include //Zsolt #include #include @@ -3516,9 +3516,9 @@ AddEncodingL( KCharacterSetIdentifierShiftJis, R_WMLBROWSER_SETTINGS_ENCODING_SHIFT_JIS ); AddEncodingL( KCharacterSetIdentifierKoi8_r, R_WMLBROWSER_SETTINGS_ENCODING_KOI8_R ); AddEncodingL( KCharacterSetIdentifierKoi8_u, R_WMLBROWSER_SETTINGS_ENCODING_KOI8_U ); - AddEncodingL( KCharacterSetIdentifierIscii, R_WMLBROWSER_SETTINGS_ENCODING_ISCII); + AddEncodingL( KCharacterSetIdentifierIscii_temp, R_WMLBROWSER_SETTINGS_ENCODING_ISCII); AddEncodingL( KCharacterSetIdentifierEucKr, R_WMLBROWSER_SETTINGS_ENCODING_EUC_KR ); - AddEncodingL( KCharacterSetIdentifierKsc5601, R_WMLBROWSER_SETTINGS_ENCODING_KSC_5601 ); + AddEncodingL( KCharacterSetIdentifierKsc5601_temp, R_WMLBROWSER_SETTINGS_ENCODING_KSC_5601 ); AddEncodingL( KCharacterSetIdentifierAutomatic, R_WMLBROWSER_SETTINGS_ENCODING_AUTOMATIC ); } diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/SettingsSrc/SettingsView.cpp --- a/browserui/browser/SettingsSrc/SettingsView.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/SettingsSrc/SettingsView.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -33,7 +33,13 @@ #include "SettingsContainer.h" #include "CommonConstants.h" +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS #include +#else +#include +#include // KNullViewId +#endif + // CONSTS // ========================= MEMBER FUNCTIONS ================================ diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/SrcData/BrowserSettings.rssi --- a/browserui/browser/SrcData/BrowserSettings.rssi Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/SrcData/BrowserSettings.rssi Thu Dec 17 08:47:18 2009 +0200 @@ -25,7 +25,7 @@ #include "Browser.hrh" // Data definitions #include // Localization constants #include -#include //Browser feature flags +#include //Browser feature flags //----------------------------------------------------------------------------- // CBAs diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/SrcData/bookmark_toolbar.rssi --- a/browserui/browser/SrcData/bookmark_toolbar.rssi Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/SrcData/bookmark_toolbar.rssi Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ */ -#include +#include #ifdef BRDO_AVKON_EXT_TB_FF @@ -139,4 +139,4 @@ { } -#endif \ No newline at end of file +#endif diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/SrcData/browser_toolbar.rssi --- a/browserui/browser/SrcData/browser_toolbar.rssi Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/SrcData/browser_toolbar.rssi Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ */ -#include +#include #ifdef BRDO_AVKON_EXT_TB_FF @@ -496,4 +496,4 @@ { } -#endif \ No newline at end of file +#endif diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/SrcData/feeds_toolbar.rssi --- a/browserui/browser/SrcData/feeds_toolbar.rssi Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/SrcData/feeds_toolbar.rssi Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ */ -#include +#include #ifdef BRDO_AVKON_EXT_TB_FF @@ -276,4 +276,4 @@ { } -#endif \ No newline at end of file +#endif diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/conf/browserui_10008D39.crml Binary file browserui/browser/conf/browserui_10008D39.crml has changed diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_bm_tb_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_bm_tb_new.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_feeds_tb_back_to_web.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_feeds_tb_back_to_web.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_feeds_tb_next.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_feeds_tb_next.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_feeds_tb_open_detail.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_feeds_tb_open_detail.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_feeds_tb_open_full.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_feeds_tb_open_full.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_feeds_tb_open_topic.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_feeds_tb_open_topic.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_feeds_tb_previous.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_feeds_tb_previous.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_feeds_tb_update.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_feeds_tb_update.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_feeds_tb_update_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_feeds_tb_update_all.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_tb_delete.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_tb_delete.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_tb_find_kw_next.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_tb_find_kw_next.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_tb_find_kw_prev.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_tb_find_kw_prev.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_tb_history_back.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_tb_history_back.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_tb_history_fw.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_tb_history_fw.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_tb_view_images.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_tb_view_images.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_browser_tb_view_pages.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_browser_tb_view_pages.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_indi_button_exit_fs.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_indi_button_exit_fs.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,6 @@ + + + + + + diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_prop_file_rss_error.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_prop_file_rss_error.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/data/qgn_prop_folder_rss_error.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/data/qgn_prop_folder_rss_error.svg Thu Dec 17 08:47:18 2009 +0200 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/help/data/xhtml.zip Binary file browserui/browser/help/data/xhtml.zip has changed diff -r b57c5fc53578 -r 868cceedabd3 browserui/browser/help/group/bld.inf --- a/browserui/browser/help/group/bld.inf Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/browser/help/group/bld.inf Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ */ #include -#include "../../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../../../../mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh" #if !defined(__PLATFORM_VERSION_32__) && !defined(__PLATFORM_VERSION_50__) && !defined(__PLATFORM_VERSION_50_TUBE__) diff -r b57c5fc53578 -r 868cceedabd3 browserui/operatormenu/group/OperatorMenu.mmp --- a/browserui/operatormenu/group/OperatorMenu.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/operatormenu/group/OperatorMenu.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -17,7 +17,7 @@ #include #include -#include +#include TARGET OperatorMenu.exe TARGETTYPE exe diff -r b57c5fc53578 -r 868cceedabd3 browserui/operatormenu/group/bld.inf --- a/browserui/operatormenu/group/bld.inf Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/operatormenu/group/bld.inf Thu Dec 17 08:47:18 2009 +0200 @@ -19,7 +19,7 @@ #include #include -#include "../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../../../mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh" PRJ_PLATFORMS diff -r b57c5fc53578 -r 868cceedabd3 browserui/operatormenu/help/group/bld.inf --- a/browserui/operatormenu/help/group/bld.inf Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/operatormenu/help/group/bld.inf Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ */ #include -#include "../../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../../../../mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh" #if !defined(__PLATFORM_VERSION_32__) && !defined(__PLATFORM_VERSION_50__) && !defined(__PLATFORM_VERSION_50_TUBE__) diff -r b57c5fc53578 -r 868cceedabd3 browserui/operatormenu/inc/OperatorMenuAppUi.h --- a/browserui/operatormenu/inc/OperatorMenuAppUi.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/operatormenu/inc/OperatorMenuAppUi.h Thu Dec 17 08:47:18 2009 +0200 @@ -29,10 +29,10 @@ #include #include #include -#include +#include #include "OperatorMenuPrivateCRKeys.h" #include //KFavouritesMaxUrl -#include +#include // CONSTANTS const TUid KUidBrowserApplication = { 0x10008d39 }; //Browser UID diff -r b57c5fc53578 -r 868cceedabd3 browserui/videoservices/group/VideoServices.mmp --- a/browserui/videoservices/group/VideoServices.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/videoservices/group/VideoServices.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -17,7 +17,7 @@ #include #include -#include +#include TARGET VideoServices.exe TARGETTYPE exe diff -r b57c5fc53578 -r 868cceedabd3 browserui/videoservices/group/bld.inf --- a/browserui/videoservices/group/bld.inf Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/videoservices/group/bld.inf Thu Dec 17 08:47:18 2009 +0200 @@ -19,7 +19,7 @@ #include #include -#include "../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../../../mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh" PRJ_PLATFORMS DEFAULT diff -r b57c5fc53578 -r 868cceedabd3 browserui/videoservices/inc/VideoServicesAppUi.h --- a/browserui/videoservices/inc/VideoServicesAppUi.h Fri Nov 06 13:02:00 2009 +0200 +++ b/browserui/videoservices/inc/VideoServicesAppUi.h Thu Dec 17 08:47:18 2009 +0200 @@ -29,11 +29,11 @@ #include #include #include -#include +#include #include "VideoServicesPrivateCRKeys.h" #include // KFavouritesMaxUrl -#include +#include // CONSTANTS const TUid KUidBrowserApplication = { 0x10008d39 }; //Browser UID diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Group/Bld.inf --- a/pushmtm/Group/Bld.inf Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Group/Bld.inf Thu Dec 17 08:47:18 2009 +0200 @@ -17,7 +17,7 @@ #include -#include "../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../../mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh" PRJ_PLATFORMS DEFAULT diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Group/PushMtmCliSrv.mmp --- a/pushmtm/Group/PushMtmCliSrv.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Group/PushMtmCliSrv.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include TARGET PushMtmCliSrv.dll diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Group/PushMtmUi.mmp --- a/pushmtm/Group/PushMtmUi.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Group/PushMtmUi.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include TARGET PushMtmUi.dll TARGETTYPE dll diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Group/PushMtmUtil.mmp --- a/pushmtm/Group/PushMtmUtil.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Group/PushMtmUtil.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include TARGET PushMtmUtil.dll TARGETTYPE dll diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Group/PushViewer.mmp --- a/pushmtm/Group/PushViewer.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Group/PushViewer.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include TARGET PushViewer.exe EPOCSTACKSIZE 0x5000 diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/MtmUiSrc/PushLoadServiceOp.cpp --- a/pushmtm/MtmUiSrc/PushLoadServiceOp.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/MtmUiSrc/PushLoadServiceOp.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Plugins/Group/PushMtmPushContentHandler.mmp --- a/pushmtm/Plugins/Group/PushMtmPushContentHandler.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Plugins/Group/PushMtmPushContentHandler.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -17,7 +17,7 @@ #include -#include +#include TARGET PushMtmPushContentHandler.dll TARGETTYPE PLUGIN diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Plugins/Group/PushMtmWhiteListAdapter.mmp --- a/pushmtm/Plugins/Group/PushMtmWhiteListAdapter.mmp Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Plugins/Group/PushMtmWhiteListAdapter.mmp Thu Dec 17 08:47:18 2009 +0200 @@ -17,7 +17,7 @@ #include -#include +#include #include #include "../WhiteListAdapterInc/WhiteListAdapterUids.h" diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Plugins/PushContentHandler/PushMtmCacheSupply.cpp --- a/pushmtm/Plugins/PushContentHandler/PushMtmCacheSupply.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Plugins/PushContentHandler/PushMtmCacheSupply.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES #include "PushMtmCacheSupply.h" -#include "HttpCacheManager.h" +#include "httpcachemanager.h" #include "PushMtmCacheDataSupplier.h" #include diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Plugins/PushContentHandler/PushMtmCacheSupply.h --- a/pushmtm/Plugins/PushContentHandler/PushMtmCacheSupply.h Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Plugins/PushContentHandler/PushMtmCacheSupply.h Thu Dec 17 08:47:18 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDES #include -#include -#include "HttpCacheManager.h" +#include +#include "httpcachemanager.h" // CONSTANTS diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Plugins/PushContentHandler/PushMtmFetchOperation.cpp --- a/pushmtm/Plugins/PushContentHandler/PushMtmFetchOperation.cpp Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Plugins/PushContentHandler/PushMtmFetchOperation.cpp Thu Dec 17 08:47:18 2009 +0200 @@ -25,11 +25,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include "PushMtmPrivateCRKeys.h" #include #include @@ -37,10 +37,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include // ================= MACROS ======================= diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Plugins/PushContentHandler/PushMtmFetchOperation.h --- a/pushmtm/Plugins/PushContentHandler/PushMtmFetchOperation.h Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Plugins/PushContentHandler/PushMtmFetchOperation.h Thu Dec 17 08:47:18 2009 +0200 @@ -28,7 +28,7 @@ #include #include #include -#include "HttpCacheManager.h" +#include "httpcachemanager.h" #include "PushMtmCacheSupply.h" // FORWARD DECLARATIONS diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/Plugins/WhiteListAdapterInc/WhiteListAdapterUids.h --- a/pushmtm/Plugins/WhiteListAdapterInc/WhiteListAdapterUids.h Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/Plugins/WhiteListAdapterInc/WhiteListAdapterUids.h Thu Dec 17 08:47:18 2009 +0200 @@ -33,4 +33,4 @@ #endif // WHITELISTADAPTERUIDS_H -// End of file \ No newline at end of file +// End of file diff -r b57c5fc53578 -r 868cceedabd3 pushmtm/help/group/bld.inf --- a/pushmtm/help/group/bld.inf Fri Nov 06 13:02:00 2009 +0200 +++ b/pushmtm/help/group/bld.inf Thu Dec 17 08:47:18 2009 +0200 @@ -18,7 +18,7 @@ */ #include -#include "../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../../../mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh" #if !defined(__PLATFORM_VERSION_32__) && !defined(__PLATFORM_VERSION_50__) && !defined(__PLATFORM_VERSION_50_TUBE__)