--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrSrvObject.cpp Wed Sep 15 13:25:15 2010 +0300
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrSrvObject.cpp Wed Oct 13 15:46:58 2010 +0300
@@ -375,7 +375,8 @@
TPckgBuf<TInt32> pckgDownloadState( aDownloadState );
TPckgBuf<TInt32> pckgProgressState( aProgressState );
-
+ if(iMessage.IsNull())
+ return EFalse;
TInt ret = iMessage.Write( 0, pckgDownloadState );
if( ret != KErrNone )
{
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp Wed Sep 15 13:25:15 2010 +0300
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp Wed Oct 13 15:46:58 2010 +0300
@@ -90,7 +90,7 @@
{EDlAttrCurrentUrl, KMaxUrlLength},
{EDlAttrName, KMaxPath},
{EDlAttrRealm,KMaxRealmLength},
- {EDlAttrUsername, KMaxDefAttrLength},
+ {EDlAttrUsername, KMaxRealmLength},
{EDlAttrPassword, KMaxDefAttrLength},
{EDlAttrProxyRealm, KMaxRealmLength},
{EDlAttrProxyUsername, KMaxDefAttrLength},
--- a/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvSession.cpp Wed Sep 15 13:25:15 2010 +0300
+++ b/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvSession.cpp Wed Oct 13 15:46:58 2010 +0300
@@ -770,6 +770,7 @@
if ( aError == KErrBadDescriptor || aError == KErrBadHandle )
{
Server().PanicClient( aError );
+ return;
}
CSession2::ServiceError( aMessage, aError );
}
Binary file browserutilities/webutils/conf/webutils.confml has changed
--- a/web_plat/download_path_plugin_api/inc/DownloadPathHandler.inl Wed Sep 15 13:25:15 2010 +0300
+++ b/web_plat/download_path_plugin_api/inc/DownloadPathHandler.inl Wed Oct 13 15:46:58 2010 +0300
@@ -2,7 +2,7 @@
File : DownloadPathHandler.inl
Part of : web_plat / download_path_plugin_api
Description : Music path plugin interface inline implementation file
- Version : %version: 3 % << Don't touch! Updated by Synergy at check-out.
+ Version : %version: 3.1.1 % << Don't touch! Updated by Synergy at check-out.
Copyright (c) 2010 Nokia Corporation.
This material, including documentation and any related
--- a/webengine/osswebengine/WebCore/editing/InsertTextCommand.cpp Wed Sep 15 13:25:15 2010 +0300
+++ b/webengine/osswebengine/WebCore/editing/InsertTextCommand.cpp Wed Oct 13 15:46:58 2010 +0300
@@ -110,6 +110,8 @@
startPosition = positionBeforeStartNode;
if (!startPosition.isCandidate())
startPosition = startPosition.downstream();
+ if(!startPosition.node())
+ return;
// FIXME: This typing around anchor behavior doesn't exactly match TextEdit. In TextEdit,
// you won't be placed inside a link when typing after it if you've just placed the caret
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp Wed Sep 15 13:25:15 2010 +0300
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp Wed Oct 13 15:46:58 2010 +0300
@@ -426,16 +426,6 @@
complete(KBrowserHTTPStatusCodes - m_transaction->Response().StatusCode());
return;
}
- else if(httpStatus == EHttpForbidden)
- {
- complete(KBrowserHTTPStatusCodes - m_transaction->Response().StatusCode());
- return;
- }
- else if(httpStatus == EHttpInternalServerError)
- {
- complete(KBrowserHTTPStatusCodes - m_transaction->Response().StatusCode());
- return;
- }
if ( !handled )
{
// url
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.cpp Wed Sep 15 13:25:15 2010 +0300
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.cpp Wed Oct 13 15:46:58 2010 +0300
@@ -597,9 +597,14 @@
{
TPtrC8 strval(*strValueBuf);
TInternetDate date;
- date.SetDateL(strval);
- TDateTime modifyTime(date.DateTime());
- aHeaders.SetFieldL(strName, modifyTime);
+
+ TRAPD(err,date.SetDateL(strval));
+
+ if(err == KErrNone)
+ {
+ TDateTime modifyTime(date.DateTime());
+ aHeaders.SetFieldL(strName, modifyTime);
+ }
}
else
{
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpSessionManager.cpp Wed Sep 15 13:25:15 2010 +0300
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpSessionManager.cpp Wed Oct 13 15:46:58 2010 +0300
@@ -222,7 +222,7 @@
}
m_httpSession.Close();
m_sessionRunning = false;
-
+ m_cookieFilterLoaded = false;
delete m_ReqHdrManager;
m_ReqHdrManager = NULL;
}
--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp Wed Sep 15 13:25:15 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp Wed Oct 13 15:46:58 2010 +0300
@@ -45,6 +45,7 @@
//-----------------------------------------------------------------------------
WebEditorClient::WebEditorClient(WebView* webview) : m_webView(webview)
{
+ m_shouldEndEditing = ETrue;
}
//-----------------------------------------------------------------------------
--- a/widgets/widgetapp/inc/WidgetUiWindowManager.h Wed Sep 15 13:25:15 2010 +0300
+++ b/widgets/widgetapp/inc/WidgetUiWindowManager.h Wed Oct 13 15:46:58 2010 +0300
@@ -636,6 +636,10 @@
TBool reConnectivityFlag;
void ConnNeededStatusL( TInt aErr );
void StopConnectionObserving();
+ void SetNewConnFlag(TBool flag);
+ TBool GetNewConnFlag();
+ //Required for setting new conn flag in Widget App UI when ap roaming happens
+ TBool iNewConnFlag;
#endif
private:
--- a/widgets/widgetapp/src/WidgetUiWindow.cpp Wed Sep 15 13:25:15 2010 +0300
+++ b/widgets/widgetapp/src/WidgetUiWindow.cpp Wed Oct 13 15:46:58 2010 +0300
@@ -924,7 +924,8 @@
User::Leave( connFailure );
}
*aNewConn = ETrue;
- if(iWindowManager.GetNetworkMode() == EOfflineMode)
+ if( !(EMiniViewEnabled == WidgetMiniViewState() ||
+ EMiniViewNotEnabled == WidgetMiniViewState()) && iWindowManager.GetNetworkMode() == EOfflineMode )
{
iWindowManager.GetConnection()->CancelConnection();
iWindowManager.GetConnection()->StopConnectionL();
@@ -935,6 +936,17 @@
TRAP_IGNORE(iWindowManager.ConnNeededStatusL(KErrNone));
#endif
}
+#ifdef BRDO_OCC_ENABLED_FF
+ else
+ {
+ TBool newConnFlag = iWindowManager.GetRetryFlag();
+ if( newConnFlag )
+ {
+ *aNewConn = ETrue;
+ iWindowManager.SetNewConnFlag(EFalse);
+ }
+ }
+#endif
}
// -----------------------------------------------------------------------------
--- a/widgets/widgetapp/src/WidgetUiWindowManager.cpp Wed Sep 15 13:25:15 2010 +0300
+++ b/widgets/widgetapp/src/WidgetUiWindowManager.cpp Wed Oct 13 15:46:58 2010 +0300
@@ -135,6 +135,10 @@
iNetworkMode(EUnknownMode),
iNetworkConnected(EFalse),
iWidgetCursorMode(TBrCtlDefs::EDefaultCursor)
+#ifdef BRDO_OCC_ENABLED_FF
+ ,
+ iNewConnFlag( EFalse )
+#endif
{
}
@@ -1637,6 +1641,7 @@
TRAP_IGNORE(ConnNeededStatusL(err)); //Start the observer again
TRAP_IGNORE( window->Engine()->HandleCommandL( (TInt)TBrCtlDefs::ECommandRetryTransactions + (TInt)TBrCtlDefs::ECommandIdBase ) );
+ SetNewConnFlag(ETrue);
}
else
{
@@ -1655,6 +1660,25 @@
{
return reConnectivityFlag;
}
+
+ // -----------------------------------------------------------------------------
+ // CWidgetUiWindowManager::SetNewConnFlag
+ // -----------------------------------------------------------------------------
+ //
+ void CWidgetUiWindowManager::SetNewConnFlag(TBool flag)
+ {
+ iNewConnFlag = flag;
+ }
+
+ // -----------------------------------------------------------------------------
+ // CWidgetUiWindowManager::GetNewConnFlag
+ // -----------------------------------------------------------------------------
+ //
+ TBool CWidgetUiWindowManager::GetNewConnFlag()
+ {
+ return iNewConnFlag;
+ }
+
#endif // BRDO_OCC_ENABLED_FF
// -----------------------------------------------------------------------------
@@ -1668,16 +1692,16 @@
if ( ( aStatus == CHWRMLight::ELightOn || aStatus == CHWRMLight::ELightOff ) && aStatus != iLightStatus )
{
iLightStatus = aStatus;
- if(iActiveFsWindow)
+ if( AnyWidgetOnHs() )
if(aStatus == CHWRMLight::ELightOn )
- {
- TRAP_IGNORE( iActiveFsWindow->Engine()->HandleCommandL(
+ {
+ TRAP_IGNORE( iWindowList[0]->Engine()->HandleCommandL(
(TInt)TBrCtlDefs::ECommandIdBase +
(TInt)TBrCtlDefs::ECommandBackLightOn ) );
}
else if(aStatus == CHWRMLight::ELightOff )
- {
- TRAP_IGNORE( iActiveFsWindow->Engine()->HandleCommandL(
+ {
+ TRAP_IGNORE( iWindowList[0]->Engine()->HandleCommandL(
(TInt)TBrCtlDefs::ECommandIdBase +
(TInt)TBrCtlDefs::ECommandBackLightOff) );
}