--- a/brdo.layers.sysdef.xml Fri Feb 19 23:55:03 2010 +0200
+++ b/brdo.layers.sysdef.xml Fri Mar 12 15:48:51 2010 +0200
@@ -13,15 +13,15 @@
<unit unitID="multipart_parser_api" name="multipart_parser_api" bldFile="&layer_real_source_path;/web_plat/multipart_parser_api/group" mrp=""/>
<unit unitID="scheme_handler_plugin_api" name="scheme_handler_plugin_api" bldFile="&layer_real_source_path;/web_plat/scheme_handler_plugin_api/group" mrp=""/>
<unit unitID="download_mgr_client_api_extn" name="download_mgr_client_api_extn" bldFile="&layer_real_source_path;/web_plat/download_mgr_client_api_extn/group" mrp=""/>
- <unit unitID="connection_manager_api" name="connection_manager_api" bldFile="&layer_real_source_path;/web_plat/connection_manager_api/group" mrp=""/>
- <unit unitID="feeds_engine_api" name="feeds_engine_api" bldFile="&layer_real_source_path;/web_plat/feeds_engine_api/group" mrp=""/>
- <unit unitID="launcher_api" name="launcher_api" bldFile="&layer_real_source_path;/web_plat/launcher_api/group" mrp=""/>
- <unit unitID="recent_url_store_api" name="recent_url_store_api" bldFile="&layer_real_source_path;/web_plat/recent_url_store_api/group" mrp=""/>
- <unit unitID="stmgesturefw_api" name="stmgesturefw_api" bldFile="&layer_real_source_path;/web_plat/stmgesturefw_api/group" mrp=""/>
- <unit unitID="scriptable_plugin_api" name="scriptable_plugin_api" bldFile="&layer_real_source_path;/web_plat/scriptable_plugin_api/group" mrp=""/>
- <unit unitID="webutils_api" name="webutils_api" bldFile="&layer_real_source_path;/web_plat/webutils_api/group" mrp=""/>
- <unit unitID="widget_registry_api" name="widget_registry_api" bldFile="&layer_real_source_path;/web_plat/widget_registry_api/group" mrp=""/>
- <unit unitID="xml_parser_api" name="xml_parser_api" bldFile="&layer_real_source_path;/web_plat/xml_parser_api/group" mrp=""/>
+ <unit unitID="connection_manager_api" name="connection_manager_api" bldFile="&layer_real_source_path;/web_plat/connection_manager_api/group" mrp=""/>
+ <unit unitID="feeds_engine_api" name="feeds_engine_api" bldFile="&layer_real_source_path;/web_plat/feeds_engine_api/group" mrp=""/>
+ <unit unitID="launcher_api" name="launcher_api" bldFile="&layer_real_source_path;/web_plat/launcher_api/group" mrp=""/>
+ <unit unitID="recent_url_store_api" name="recent_url_store_api" bldFile="&layer_real_source_path;/web_plat/recent_url_store_api/group" mrp=""/>
+ <unit unitID="stmgesturefw_api" name="stmgesturefw_api" bldFile="&layer_real_source_path;/web_plat/stmgesturefw_api/group" mrp=""/>
+ <unit unitID="scriptable_plugin_api" name="scriptable_plugin_api" bldFile="&layer_real_source_path;/web_plat/scriptable_plugin_api/group" mrp=""/>
+ <unit unitID="webutils_api" name="webutils_api" bldFile="&layer_real_source_path;/web_plat/webutils_api/group" mrp=""/>
+ <unit unitID="widget_registry_api" name="widget_registry_api" bldFile="&layer_real_source_path;/web_plat/widget_registry_api/group" mrp=""/>
+ <unit unitID="xml_parser_api" name="xml_parser_api" bldFile="&layer_real_source_path;/web_plat/xml_parser_api/group" mrp=""/>
</module>
<module name="web_pub">
<unit unitID="browser_control_api" name="browser_control_api" bldFile="&layer_real_source_path;/web_pub/browser_control_api/group" mrp=""/>
@@ -29,13 +29,13 @@
<unit unitID="download_mgr_client_api" name="download_mgr_client_api" bldFile="&layer_real_source_path;/web_pub/download_mgr_client_api/group" mrp=""/>
<unit unitID="download_mgr_ui_api" name="download_mgr_ui_api" bldFile="&layer_real_source_path;/web_pub/download_mgr_ui_api/group" mrp=""/>
<unit unitID="favourites_engine_api" name="favourites_engine_api" bldFile="&layer_real_source_path;/web_pub/favourites_engine_api/group" mrp=""/>
- <unit unitID="settings_api" name="settings_api" bldFile="&layer_real_source_path;/web_pub/settings_api/group" mrp=""/>
+ <unit unitID="settings_api" name="settings_api" bldFile="&layer_real_source_path;/web_pub/settings_api/group" mrp=""/>
</module>
<module name="browser_utilities">
<unit unitID="browserdialogsprovider" name="browserdialogsprovider" bldFile="&layer_real_source_path;/browserutilities/browserdialogsprovider/group" mrp=""/>
<unit unitID="recenturlstore" name="recenturlstore" bldFile="&layer_real_source_path;/browserutilities/recenturlstore/group" mrp=""/>
+ <unit unitID="cxmllibrary" name="cxmlparser" bldFile="&layer_real_source_path;/browserutilities/cxmllibrary/group" mrp=""/>
<unit unitID="xmlparser" name="cxmlparser" bldFile="&layer_real_source_path;/browserutilities/xmlparser/group" mrp=""/>
- <unit unitID="cxmllibrary" name="cxmlparser" bldFile="&layer_real_source_path;/browserutilities/cxmllibrary/group" mrp=""/>
<unit unitID="downloadmgr" name="downloadmgr" bldFile="&layer_real_source_path;/browserutilities/downloadmgr/group" mrp=""/>
<unit unitID="connectionmanager" name="connectionmanager" bldFile="&layer_real_source_path;/browserutilities/connectionmanager/group" mrp=""/>
<unit unitID="browsertelservice" name="browsertelservice" bldFile="&layer_real_source_path;/browserutilities/browsertelservice/group" mrp=""/>
@@ -99,14 +99,14 @@
<unit unitID="wmlengine_urlloader" name="wmlengine_urlloader" bldFile="&layer_real_source_path;/webengine/wmlengine/group/urlloader" mrp=""/>
<unit unitID="wmlengine_browser" name="wmlengine_browser" bldFile="&layer_real_source_path;/webengine/wmlengine/group/browser" mrp=""/>
<unit unitID="wmlengine_wmlengine" name="wmlengine_wmlengine" bldFile="&layer_real_source_path;/webengine/wmlengine/group/wmlengine" mrp=""/>
- </component>
+ </component>
<unit unitID="device" name="device" bldFile="&layer_real_source_path;/webengine/device/group" mrp=""/>
<unit unitID="widgetengine" name="widgetengine" bldFile="&layer_real_source_path;/webengine/widgetengine/group" mrp=""/>
<unit unitID="memoryplugin" name="memoryplugin" bldFile="&layer_real_source_path;/webengine/memoryplugin/group" mrp=""/>
<unit unitID="widgetmemoryplugin" name="widgetmemoryplugin" bldFile="&layer_real_source_path;/webengine/widgetmemoryplugin/group" mrp=""/>
<unit unitID="widgetbackuprestore" name="widgetbackuprestore" bldFile="&layer_real_source_path;/webengine/widgetbackuprestore/group" mrp=""/>
<unit unitID="browserrecognizers" name="browserrecognizers" bldFile="&layer_real_source_path;/webengine/browserrecognizers/group" mrp=""/>
- <unit unitID="wrtharvester" name="wrtharvester" bldFile="&layer_real_source_path;/webengine/wrtharvester/group" mrp=""/>
+ <unit unitID="wrtharvester" name="wrtharvester" bldFile="&layer_real_source_path;/webengine/wrtharvester/group" mrp=""/>
</module>
<module name="codhandler">
<unit unitID="codhandler" name="codhandler" bldFile="&layer_real_source_path;/codhandler/group" mrp=""/>
--- a/browserutilities/browsertelservice/src/BrowserTelService.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/browserutilities/browsertelservice/src/BrowserTelService.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -35,7 +35,6 @@
//
#include <txtrich.h>
#include <badesca.h>
-#include <miutset.h>
#include <s32strm.h>
// For email API
@@ -82,6 +81,10 @@
const TInt KParseArrayAllocation = 10;
const TInt KTimerDelay = 2500000;
+//constants
+const TUid KUidMsgTypeSMTP = {0x10001028}; // 268439592
+
+
_LIT( KValidDTMFChars,"w/p*#0123456789ABCDabcd," );
_LIT( KDTMFWaitChars, "/wp,*#" );
#ifdef __BROWSER_TEL_SERVICES_CALLUI__
--- a/browserutilities/connectionmanager/Src/ConnectionObservers.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/browserutilities/connectionmanager/Src/ConnectionObservers.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -20,9 +20,7 @@
#include <nifman.h>
#include <nifvar.h>
-#include <es_enum.h>
#include <in_sock.h>
-#include <cdbcols.h>
#include <connectionobservers.h>
#include "ConnectionManagerLogger.h"
--- a/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -29,7 +29,6 @@
#include <AknNotifyStd.h>
#include <AknGlobalNote.h>
#include <e32std.h>
-#include <es_enum.h>
#include <ApUtils.h>
#include <ApDataHandler.h>
#include <cdbstore.h>
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp Fri Feb 19 23:55:03 2010 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp Fri Mar 12 15:48:51 2010 +0200
@@ -41,6 +41,8 @@
MW_LAYER_SYSTEMINCLUDE
#if defined(__PLATFORM_VERSION_50_TUBE__) || defined( __PLATFORM_VERSION_50__)
+MW_LAYER_ECOM_SYSTEMINCLUDE
+MW_LAYER_HTTP_SYSTEMINCLUDE
APP_LAYER_SYSTEMINCLUDE
#endif
@@ -100,6 +102,11 @@
#ifdef BRDO_OCC_ENABLED_FF
LIBRARY extendedconnpref.lib
LIBRARY netmeta.lib
+LIBRARY centralrepository.lib
+LIBRARY featmgr.lib
+LIBRARY etel.lib
+LIBRARY etelmm.lib
+LIBRARY connmon.lib
#endif
// End of File
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpConnHandler.h Fri Feb 19 23:55:03 2010 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpConnHandler.h Fri Mar 12 15:48:51 2010 +0200
@@ -21,6 +21,7 @@
#define HTTPCONNHANDLER_H
// INCLUDES
+#include <platform/mw/browser_platform_variant.hrh>
#include <e32base.h>
#include <es_sock.h>
#include <http.h>
@@ -402,6 +403,10 @@
* By default Symbian 2nd phase constructor is private.
*/
void ConstructL();
+#ifdef BRDO_OCC_ENABLED_FF
+ TBool IsPhoneOfflineL() const;
+ TBool IsRoamingL();
+#endif
public: // Data
// ?one_line_short_description_of_data
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -35,6 +35,13 @@
#include <platform/mw/browser_platform_variant.hrh>
#ifdef BRDO_OCC_ENABLED_FF
#include <extendedconnpref.h>
+#include <FeatMgr.h>
+#include <CentralRepository.h>
+#include <CoreApplicationUIsSDKCRKeys.h>
+#include <cmgenconnsettings.h>
+#include <cmmanagerkeys.h>
+#include <etelmm.h>
+#include <rconnmon.h>
#endif
// EXTERNAL DATA STRUCTURES
@@ -357,7 +364,6 @@
TName connName;
connName.Copy( *iConnName );
-
User::LeaveIfError( iConnection.Open( iClientApp->Engine()->SocketServ(), connName ) );
CLOG_WRITE( "connection open" );
@@ -400,8 +406,25 @@
CLOG_WRITE( "Using Internet Snap");
extPref.SetSnapPurpose(CMManager::ESnapPurposeInternet);
}
-
+ //Default dialog behaviour
extPref.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent);
+
+ if ( !IsPhoneOfflineL() )
+ {
+ TInt currentmode = KErrNone;
+ CRepository* rep = CRepository::NewLC( KCRUidCmManager );
+ rep->Get(KCurrentCellularDataUsage, currentmode );
+ CleanupStack::PopAndDestroy(); //rep
+ if(ECmCellularDataUsageConfirm == currentmode)
+ {
+ if ( IsRoamingL() || (iIapId == 0) )
+ {
+ CLOG_WRITE( "Setting note behaviour as Default");
+ extPref.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault);
+ }
+ }
+ }
+
TConnPrefList prefList;
prefList.AppendL(&extPref);
iConnection.Start( prefList, iStatus );
@@ -994,4 +1017,100 @@
}
}
+#ifdef BRDO_OCC_ENABLED_FF
+// ---------------------------------------------------------
+// CHttpConnHandler::IsPhoneOfflineL
+//
+// Checks if phone is in offline mode or not.
+// Return ETrue if phone is in offline mode.
+// Return EFalse if phone is not in offline mode.
+// ---------------------------------------------------------
+//
+TBool CHttpConnHandler::IsPhoneOfflineL() const
+ {
+ LOGGER_ENTERFN( "CHttpConnHandler::IsPhoneOfflineL" );
+ if ( FeatureManager::FeatureSupported( KFeatureIdOfflineMode ) )
+ {
+ CRepository* repository = CRepository::NewLC( KCRUidCoreApplicationUIs );
+ TInt connAllowed = 1;
+ repository->Get( KCoreAppUIsNetworkConnectionAllowed, connAllowed );
+ CleanupStack::PopAndDestroy(); // repository
+ if ( !connAllowed )
+ {
+ CLOG_WRITE( "Yes, Phone is in Offline mode" );
+ return ETrue;
+ }
+ }
+ CLOG_WRITE( "Phone is in Online mode" );
+ return EFalse;
+ }
+
+// ---------------------------------------------------------
+// CHttpConnHandler::IsRoamingL
+//
+// Checks if phone is in home network or in roam network.
+// Return ETrue if phone is in foriegn network.
+// Return EFalse if phone is in home network.
+// ---------------------------------------------------------
+//
+TBool CHttpConnHandler::IsRoamingL()
+ {
+ LOGGER_ENTERFN( "CHttpConnHandler::IsRoamingL" );
+ RTelServer telServer;
+ User::LeaveIfError( telServer.Connect());
+
+ RTelServer::TPhoneInfo teleinfo;
+ User::LeaveIfError( telServer.GetPhoneInfo( 0, teleinfo ) );
+
+ RMobilePhone phone;
+ User::LeaveIfError( phone.Open( telServer, teleinfo.iName ) );
+ User::LeaveIfError(phone.Initialise());
+
+ RMobilePhone::TMobilePhoneNetworkMode mode;
+ TInt err = phone.GetCurrentMode( mode );
+ phone.Close();
+ telServer.Close();
+ TInt Bearer = EBearerIdGSM ;
+ if( KErrNone == err )
+ {
+ switch(mode)
+ {
+ case RMobilePhone::ENetworkModeGsm:
+ {
+ Bearer = EBearerIdGSM ;
+ break;
+ }
+ case RMobilePhone::ENetworkModeWcdma:
+ {
+ Bearer = EBearerIdWCDMA ;
+ break;
+ }
+ default:
+ {
+
+ }
+ }
+ }
+ RConnectionMonitor monitor;
+ TRequestStatus status;
+ // open RConnectionMonitor object
+ monitor.ConnectL();
+ CleanupClosePushL( monitor );
+ TInt netwStatus ;
+ monitor.GetIntAttribute( Bearer, 0, KNetworkRegistration, netwStatus, status );
+ User::WaitForRequest( status );
+ CleanupStack::PopAndDestroy(); // Destroying monitor
+ if ( status.Int() == KErrNone && netwStatus == ENetworkRegistrationRoaming )
+ {
+ CLOG_WRITE( "Yes, Phone is in Forign network" );
+ return ETrue;
+ }
+ else //home n/w or some other state in n/w
+ {
+ CLOG_WRITE( "Phone is in Home network" );
+ return EFalse;
+ }
+ }
+#endif
+
// End of File
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp Fri Feb 19 23:55:03 2010 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp Fri Mar 12 15:48:51 2010 +0200
@@ -65,6 +65,7 @@
#if defined(__PLATFORM_VERSION_50_TUBE__) || defined( __PLATFORM_VERSION_50__)
APP_LAYER_SYSTEMINCLUDE
+MW_LAYER_HTTP_SYSTEMINCLUDE
#endif
SOURCEPATH ../Src
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CUserInteractionsUtils.h Fri Feb 19 23:55:03 2010 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CUserInteractionsUtils.h Fri Mar 12 15:48:51 2010 +0200
@@ -358,6 +358,13 @@
* To Know if its a COD DL
*/
TBool IsCodDownload();
+
+ /**
+ * Performs a simple check for existence of aFileName.
+ * @param aFileName The filename selected by user, including path
+ * @return TBool indicating if file exists
+ */
+ TBool IsDuplicateL( const TPtrC& aFileName );
protected: // Constructors
@@ -394,12 +401,6 @@
*/
TBool GenerateNewNameL( TPtr& aFileName, TInt& aCounter );
- /**
- * Performs a simple check for existence of aFileName.
- * @param aFileName The filename selected by user, including path
- * @return TBool indicating if file exists
- */
- TBool IsDuplicateL( const TPtrC& aFileName );
private: // Data
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -2536,8 +2536,24 @@
// ----------------------------------------------------
//
void CDownloadMgrUiDownloadsList::HandleAIWCommandL(TInt aCommand, RHttpDownload& aDownload)
+
{
- // The command is an AIW command
+ //Check if file exists
+ HBufC* fileName = HBufC::NewLC( KMaxPath );
+ TPtr fileNamePtr = fileName->Des();
+ User::LeaveIfError( aDownload.GetStringAttribute( EDlAttrDestFilename, fileNamePtr ) );
+ if(!iUiUtils->IsDuplicateL(fileNamePtr))
+ {
+ HBufC* infoPrompt = StringLoader::LoadLC( R_DMUL_ERROR_FILE_NOT_FOUND);
+ CAknInformationNote* note = new(ELeave) CAknInformationNote();
+ note->ExecuteLD(*infoPrompt);
+ CleanupStack::PopAndDestroy(infoPrompt);
+ CleanupStack::PopAndDestroy(fileName);
+ return;
+ }
+ CleanupStack::PopAndDestroy(fileName);
+
+ // The command is an AIW command
CAiwGenericParamList& params = iAIWServiceHandler->InParamListL();
TInt aiwOptions( 0 );
--- a/browserutilities/group/bld.inf Fri Feb 19 23:55:03 2010 +0200
+++ b/browserutilities/group/bld.inf Fri Mar 12 15:48:51 2010 +0200
@@ -11,14 +11,14 @@
*
* Contributors:
*
-* Description:
+* Description:
*
*/
#include "../browserdialogsprovider/group/bld.inf"
#include "../recenturlstore/group/bld.inf"
+#include "../cxmllibrary/group/bld.inf"
#include "../xmlparser/group/bld.inf"
-#include "../cxmllibrary/group/bld.inf"
#include "../downloadmgr/group/bld.inf"
#include "../connectionmanager/group/bld.inf"
#include "../browsertelservice/group/bld.inf"
Binary file browserutilities/webutils/conf/webutils.confml has changed
--- a/codhandler/codeng/group/CodEng.mmp Fri Feb 19 23:55:03 2010 +0200
+++ b/codhandler/codeng/group/CodEng.mmp Fri Mar 12 15:48:51 2010 +0200
@@ -121,4 +121,9 @@
#ifdef BRDO_OCC_ENABLED_FF
LIBRARY extendedconnpref.lib
LIBRARY netmeta.lib
+LIBRARY centralrepository.lib
+LIBRARY featmgr.lib
+LIBRARY etel.lib
+LIBRARY etelmm.lib
+LIBRARY connmon.lib
#endif
\ No newline at end of file
--- a/codhandler/codeng/inc/Connection.h Fri Feb 19 23:55:03 2010 +0200
+++ b/codhandler/codeng/inc/Connection.h Fri Mar 12 15:48:51 2010 +0200
@@ -22,7 +22,7 @@
#define CONNECTION_H
// INCLUDES
-
+#include <platform/mw/browser_platform_variant.hrh>
#include <e32base.h>
#include <es_sock.h>
#include <CommDbConnPref.h>
@@ -106,6 +106,11 @@
* Second phase constructor. Leaves on failure.
*/
void ConstructL();
+
+#ifdef BRDO_OCC_ENABLED_FF
+ TBool IsPhoneOfflineL() const;
+ TBool IsRoamingL();
+#endif
private: // from CActive
--- a/codhandler/codeng/src/CodEngBase.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/codhandler/codeng/src/CodEngBase.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -1894,7 +1894,7 @@
for ( TInt i = 0; i < (*iData)[iData->ActiveDownload()]->Types().MdcaCount(); i++ )
{
const TDataType& type( (*iData)[iData->ActiveDownload()]->Types().MdcaPoint( i ) );
- if( ( aType.Find (type.Des8()) != KErrNotFound ) ||
+ if((aType.Find (type.Des8()) != KErrNotFound) || iDocHandler->CanOpenL(TDataType(aType)) ||
( (type.Des8().Find(KOma1DrmMessageContentType)!= KErrNotFound) && (aType.Find(KOma1DcfContentType)!= KErrNotFound ) ))
{
contentTypeMisMatch = EFalse;
--- a/codhandler/codeng/src/Connection.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/codhandler/codeng/src/Connection.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -31,6 +31,13 @@
#include <platform/mw/browser_platform_variant.hrh>
#ifdef BRDO_OCC_ENABLED_FF
#include <extendedconnpref.h>
+#include <FeatMgr.h>
+#include <CentralRepository.h>
+#include <CoreApplicationUIsSDKCRKeys.h>
+#include <cmgenconnsettings.h>
+#include <cmmanagerkeys.h>
+#include <etelmm.h>
+#include <rconnmon.h>
#endif
// ================= MEMBER FUNCTIONS =======================
@@ -115,7 +122,25 @@
extPref.SetSnapPurpose(CMManager::ESnapPurposeInternet);
}
+ //Default dialog behaviour
extPref.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent);
+
+ if ( !IsPhoneOfflineL() )
+ {
+ TInt currentmode = KErrNone;
+ CRepository* rep = CRepository::NewLC( KCRUidCmManager );
+ rep->Get(KCurrentCellularDataUsage, currentmode );
+ CleanupStack::PopAndDestroy(); //rep
+ if(ECmCellularDataUsageConfirm == currentmode)
+ {
+ if ( IsRoamingL() || (aIap == 0) )
+ {
+ CLOG(( EConn, 4, _L("Setting note behaviour as Default") ));
+ extPref.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault);
+ }
+ }
+ }
+
TConnPrefList prefList;
prefList.AppendL(&extPref);
iConn.Start( prefList, iStatus );
@@ -343,3 +368,98 @@
User::RequestComplete( iParentStatus, iStatus.Int() );
iParentStatus = NULL;
}
+
+#ifdef BRDO_OCC_ENABLED_FF
+// ---------------------------------------------------------
+// CConnection::IsPhoneOfflineL
+//
+// Checks if phone is in offline mode or not.
+// Return ETrue if phone is in offline mode.
+// Return EFalse if phone is not in offline mode.
+// ---------------------------------------------------------
+//
+TBool CConnection::IsPhoneOfflineL() const
+ {
+ if ( FeatureManager::FeatureSupported( KFeatureIdOfflineMode ) )
+ {
+ CRepository* repository = CRepository::NewLC( KCRUidCoreApplicationUIs );
+ TInt connAllowed = 1;
+ repository->Get( KCoreAppUIsNetworkConnectionAllowed, connAllowed );
+ CleanupStack::PopAndDestroy(); // repository
+ if ( !connAllowed )
+ {
+ CLOG(( EConn, 2, _L("Yes, Phone is in Offline mode") ));
+ return ETrue;
+ }
+ }
+
+ CLOG(( EConn, 2, _L("Phone is in Online mode") ));
+ return EFalse;
+ }
+
+// ---------------------------------------------------------
+// CConnection::IsRoamingL
+//
+// Checks if phone is in home network or in roam network.
+// Return ETrue if phone is in foriegn network.
+// Return EFalse if phone is in home network.
+// ---------------------------------------------------------
+//
+TBool CConnection::IsRoamingL()
+ {
+ RTelServer telServer;
+ User::LeaveIfError( telServer.Connect());
+
+ RTelServer::TPhoneInfo teleinfo;
+ User::LeaveIfError( telServer.GetPhoneInfo( 0, teleinfo ) );
+
+ RMobilePhone phone;
+ User::LeaveIfError( phone.Open( telServer, teleinfo.iName ) );
+ User::LeaveIfError(phone.Initialise());
+
+ RMobilePhone::TMobilePhoneNetworkMode mode;
+ TInt err = phone.GetCurrentMode( mode );
+ phone.Close();
+ telServer.Close();
+ TInt Bearer = EBearerIdGSM ;
+ if( KErrNone == err )
+ {
+ switch(mode)
+ {
+ case RMobilePhone::ENetworkModeGsm:
+ {
+ Bearer = EBearerIdGSM ;
+ break;
+ }
+ case RMobilePhone::ENetworkModeWcdma:
+ {
+ Bearer = EBearerIdWCDMA ;
+ break;
+ }
+ default:
+ {
+
+ }
+ }
+ }
+ RConnectionMonitor monitor;
+ TRequestStatus status;
+ // open RConnectionMonitor object
+ monitor.ConnectL();
+ CleanupClosePushL( monitor );
+ TInt netwStatus ;
+ monitor.GetIntAttribute( Bearer, 0, KNetworkRegistration, netwStatus, status );
+ User::WaitForRequest( status );
+ CleanupStack::PopAndDestroy(); // Destroying monitor
+ if ( status.Int() == KErrNone && netwStatus == ENetworkRegistrationRoaming )
+ {
+ CLOG(( EConn, 2, _L("Yes, Phone is in Forign network") ));
+ return ETrue;
+ }
+ else //home n/w or some other state in n/w
+ {
+ CLOG(( EConn, 2, _L("Phone is in Home network") ));
+ return EFalse;
+ }
+ }
+#endif
--- a/codhandler/codeng/src/FileSaver.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/codhandler/codeng/src/FileSaver.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -281,7 +281,7 @@
else
{
// Other than DRM stuff arrived. Proper check for MIME type.
- if( !(*aData[aData.ActiveDownload()]).HasType( iType.Des8() ) )
+ if( !(*aData[aData.ActiveDownload()]).HasType( iType.Des8() ) && ! iDocHandler.CanSaveL(iType) )
{
CLOG(( ECodEng, 4, _L(" mismatch") ));
User::Leave( KErrCodAttributeMismatch );
--- a/codhandler/codeng/src/HttpLoader.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/codhandler/codeng/src/HttpLoader.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -48,7 +48,8 @@
#include "CodData.h"
_LIT8( KDRMOldContentType, "x-drm-old-content-type"); // old content type header to be added
-_LIT8( KAcceptRangeHeader, "bytes");
+_LIT8( KAcceptRangeHeader, "bytes");
+_LIT8( KAcceptRangeHeaderNone, "none");
// ================= CONSTANTS =======================
@@ -1066,16 +1067,15 @@
THTTPHdrVal value;
TInt index = FindHeaderField(iResponseHeaders, range.DesC());
-
if( index != KErrNotFound )
- {
- if( !(*iResponseHeaders)[index]->FieldRawData()->Compare( KAcceptRangeHeader() ) )
- {
- return ETrue;
- }
- }
-
- return EFalse;
+ {
+ if( !(*iResponseHeaders)[index]->FieldRawData()->Compare( KAcceptRangeHeaderNone() ) )
+ {
+ return EFalse;
+ }
+ }
+ return ETrue;
+
}
// ---------------------------------------------------------
--- a/codhandler/codui/group/CodUi.mmp Fri Feb 19 23:55:03 2010 +0200
+++ b/codhandler/codui/group/CodUi.mmp Fri Mar 12 15:48:51 2010 +0200
@@ -57,8 +57,7 @@
USERINCLUDE ../inc
USERINCLUDE ../../CodEng/inc
-// MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
LIBRARY efsrv.lib
LIBRARY apparc.lib
--- a/codhandler/roapapp/group/RoapApp.mmp Fri Feb 19 23:55:03 2010 +0200
+++ b/codhandler/roapapp/group/RoapApp.mmp Fri Mar 12 15:48:51 2010 +0200
@@ -54,8 +54,7 @@
USERINCLUDE ../inc
-// MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
LIBRARY efsrv.lib
LIBRARY apparc.lib
--- a/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh Fri Feb 19 23:55:03 2010 +0200
+++ b/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh Fri Mar 12 15:48:51 2010 +0200
@@ -300,6 +300,13 @@
#define MW_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/connect
#endif
+#ifndef MW_LAYER_ECOM_SYSTEMINCLUDE
+#define MW_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/ecom
+#endif
+#ifndef MW_LAYER_HTTP_SYSTEMINCLUDE
+#define MW_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/http
+#endif
+
// Defines Symbian HTTP stack parameters specific for symbian 9.3 (e.g. EHttpEnableOptimalPipelining, EHttpOptimalPipelining)
//Flag need to be removed after this fix is supplied to Symbian 9.4
#undef BRDO_HTTP_STACK_93
--- a/web_plat/connection_manager_api/inc/ConnectionObservers.h Fri Feb 19 23:55:03 2010 +0200
+++ b/web_plat/connection_manager_api/inc/ConnectionObservers.h Fri Mar 12 15:48:51 2010 +0200
@@ -24,7 +24,8 @@
//System includes
#include <es_sock.h>
-
+#include <es_enum.h>
+#include <cdbcols.h>
//You should inherit from this if you want to observe connection stages
class MConnectionStageObserver
--- a/web_plat/connection_manager_api/inc/InternetConnectionManager.h Fri Feb 19 23:55:03 2010 +0200
+++ b/web_plat/connection_manager_api/inc/InternetConnectionManager.h Fri Mar 12 15:48:51 2010 +0200
@@ -245,11 +245,6 @@
*/
IMPORT_C void ShowConnectionChangedDlg();
- /**
- * Cancels the connection.
- * @return none.
- */
- virtual void CancelConnection();
public:
@@ -633,6 +628,13 @@
void InitializeL();
+ public:
+ /**
+ * Cancels the connection.
+ * @return none.
+ */
+ virtual void CancelConnection();
+
private:
CApAccessPointItem* iCurrentAP;
--- a/web_pub/browser_control_api/inc/BrCtlDefs.h Fri Feb 19 23:55:03 2010 +0200
+++ b/web_pub/browser_control_api/inc/BrCtlDefs.h Fri Mar 12 15:48:51 2010 +0200
@@ -558,7 +558,8 @@
ECapabilityFavicon = 0x8000,
ECapabilityToolBar = 0x00010000,
ECapabilityWebKitLite = 0x00020000,
- ECapabilityFitToScreen = 0x00040000
+ ECapabilityFitToScreen = 0x00040000,
+ ECapabilityPinchZoom = 0x00080000
};
/**
--- a/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h Fri Feb 19 23:55:03 2010 +0200
+++ b/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h Fri Mar 12 15:48:51 2010 +0200
@@ -1,22 +1,18 @@
/*
-* ==============================================================================
-* Name : favouritesenginetest.h
-* Part of : ?Subsystem_name / FavouritesEngineTest
-*
-* Description : FavouritesEngineTest test module.
-* Version: 0.5
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
-* Copyright (C) 2002 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
*
-* ============================================================================
+* Contributors:
+*
+* Description:
+*
*/
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -1,22 +1,19 @@
/*
-* ==============================================================================
-* Name : FavouritesEngineTest.cpp
-* Part of : ?Subsystem_name / FavouritesEngineTest
-*
-* Description : FavouritesBCTest class member functions
-* Version: 0.5
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
-* Copyright (C) 2006 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
*
-* ============================================================================
+* Contributors:
+*
+* Description:
+*
+*
*/
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -1,23 +1,19 @@
/*
-* ============================================================================
-* Name: FavouritesItemTestCases.cpp
-* Part of: FavouritesEngineTest class member functions
-*
-* Description:
-*
-* Version: 1.0
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
-* Copyright (C) 2008 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
*
-* ============================================================================
+* Contributors:
+*
+* Description:
+*
+*
*/
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -1,23 +1,19 @@
/*
-* ============================================================================
-* Name: FavouritesWapApTestCases.cpp
-* Part of: FavouritesEngineTest class member functions
-*
-* Description:
-*
-* Version: 0.5
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
-* Copyright (C) 2002 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
*
-* ============================================================================
+* Contributors:
+*
+* Description:
+*
+*
*/
--- a/webengine/osswebengine/WebCore/loader/CachedImage.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebCore/loader/CachedImage.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -98,12 +98,11 @@
static Image* brokenImage()
{
- static OwnPtr<Image*> brokenImage;
+ static Image* brokenImage;
if (!brokenImage) {
- brokenImage.set(Image::loadPlatformResource("missingImage"));
+ brokenImage = Image::loadPlatformResource("missingImage");
}
- Image* ret = brokenImage.get();
- return ret;
+ return brokenImage;
}
static Image* nullImage()
--- a/webengine/osswebengine/WebCore/platform/graphics/BitmapImage.h Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebCore/platform/graphics/BitmapImage.h Fri Mar 12 15:48:51 2010 +0200
@@ -196,7 +196,7 @@
#endif
#if PLATFORM(SYMBIAN)
mutable CMaskedBitmap* m_maskedBitmap;
- ImageObserver* m_imageObserver;
+
#endif
Color m_solidColor; // If we're a 1x1 solid color, this is the color to use to fill.
--- a/webengine/osswebengine/WebCore/platform/graphics/symbian/ImageSymbian.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebCore/platform/graphics/symbian/ImageSymbian.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -106,7 +106,6 @@
, m_repetitionCount(0)
, m_repetitionsComplete(0)
, m_maskedBitmap( bitmap )
- , m_imageObserver(0)
, m_isSolidColor(false)
, m_animatingImageType(true)
, m_animationFinished(false)
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -181,7 +181,7 @@
}
case ESomeItemsNotSecure:
{
- resId = R_HTTPSEC_SOME_ITEMS_NOT_SECURE;
+ resId = 0;
event = TBrCtlDefs::EEventSomeItemsNotSecure;
break;
}
--- a/webengine/osswebengine/WebCore/platform/network/symbian/SynchLoader.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/SynchLoader.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -27,6 +27,10 @@
namespace WebCore {
+const int KSyncRequestTimeOut = 3*1000*1000;
+
+int syncRequestTimerCb( void* ptr );
+
// ============================SynchLoader MEMBER FUNCTIONS ===============================
class SynchResourceHandleClient;
@@ -142,6 +146,7 @@
, m_response()
, m_error(String(), KErrNone, String(), String())
, m_data(0)
+ , m_syncRequestTimer(0)
{
m_status = &aStatus;
@@ -150,11 +155,19 @@
if (m_loader) {
m_resourceHandle = m_loader->handle();
+
+ //Start the synchronous request expiry timer
+ m_syncRequestTimer = CPeriodic::NewL(CActive::EPriorityHigh);
+ m_syncRequestTimer->Start( KSyncRequestTimeOut,0,TCallBack(&syncRequestTimerCb,this));
}
}
SynchResourceHandleClient::~SynchResourceHandleClient()
{
+ if (m_syncRequestTimer && m_syncRequestTimer->IsActive()) {
+ m_syncRequestTimer->Cancel();
+ }
+ delete m_syncRequestTimer;
}
PassRefPtr<SynchResourceHandleClient> SynchResourceHandleClient::create(TRequestStatus& aStatus,
@@ -217,6 +230,11 @@
{
m_error = error;
+ //Cancel the synchronous Request timer
+ if (m_syncRequestTimer->IsActive()) {
+ m_syncRequestTimer->Cancel();
+ }
+
if (!m_finished) { // Avoid multiple execution
if (m_loader) {
m_loader->removeSubresourceLoader();
@@ -234,5 +252,19 @@
//m_loader = 0;
}
+void SynchResourceHandleClient::handleSyncRequestTimeOut()
+{
+ cancel(ResourceError(String(), KErrCancel, String(), String()));
+}
+
+// -----------------------------------------------------------------------------
+// syncRequestTimerCb
+// -----------------------------------------------------------------------------
+int syncRequestTimerCb(void* ptr)
+{
+ ((SynchResourceHandleClient*)ptr)->handleSyncRequestTimeOut();
+ return 0;
+}
+
} // End namespace WebCore
--- a/webengine/osswebengine/WebCore/platform/network/symbian/SynchLoader.h Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/SynchLoader.h Fri Mar 12 15:48:51 2010 +0200
@@ -76,6 +76,7 @@
ResourceError resourceError() const { return m_error; }
Vector<char> data() const { return m_data; }
ResourceHandle* resourceHandle() const { return m_resourceHandle.get(); }
+ void handleSyncRequestTimeOut();
private:
SynchResourceHandleClient(TRequestStatus&, const ResourceRequest&, Frame*);
@@ -92,6 +93,7 @@
RefPtr<SynchLoader> m_loader;
RefPtr<ResourceHandle> m_resourceHandle;
TRequestStatus* m_status;
+ CPeriodic* m_syncRequestTimer; // <<owned>>
}; // end class SynchResourceHandleClient
--- a/webengine/osswebengine/WebCore/rendering/break_lines.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebCore/rendering/break_lines.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -36,6 +36,7 @@
case ' ':
case '\n':
case '\t':
+ case zeroWidthSpace:
return true;
case noBreakSpace:
return treatNoBreakSpaceAsBreak;
--- a/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/bld.inf Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/bld.inf Fri Mar 12 15:48:51 2010 +0200
@@ -11,15 +11,19 @@
*
* Contributors:
*
-* Description:
+* Description:
*
*/
+#include <platform_paths.hrh>
+#include <data_caging_paths.hrh>
+#include "../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
+
PRJ_PLATFORMS
DEFAULT
-// Export
+// Export
PRJ_EXPORTS
#ifdef __S60_32__
../../../../JavaScriptCore/bindings/npruntime.h MW_LAYER_SDK_EXPORT_PATH(javascriptcore/npruntime.h)
--- a/webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -807,13 +807,6 @@
event.param = &ev;
ret = m_pluginskin->getNPPluginFucs()->event(m_pluginskin->getNPP(),
static_cast<void*>(&event));
-
- if (eventForPlugin.Code(EAxisBoth) == EGestureTap) {
- eventForPlugin.SetCode(EGestureReleased);
- ret = m_pluginskin->getNPPluginFucs()->event(m_pluginskin->getNPP(),
- static_cast<void*>(&event));
-
- }
}
}
else if(!m_windowedPlugin && m_pluginskin->getNPPluginFucs() && m_pluginskin->getNPPluginFucs()->event){
@@ -831,13 +824,6 @@
event.param = &ev;
ret = m_pluginskin->getNPPluginFucs()->event(m_pluginskin->getNPP(),
static_cast<void*>(&event));
-
- if (eventForPlugin.Code(EAxisBoth) == EGestureTap) {
- eventForPlugin.SetCode(EGestureReleased);
- ret = m_pluginskin->getNPPluginFucs()->event(m_pluginskin->getNPP(),
- static_cast<void*>(&event));
-
- }
}
}
return ret;
--- a/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -260,7 +260,10 @@
}
case TBrCtlDefs::ESettingsNumOfDownloads :
{
- retVal = httpSessionMgr->httpDownload()->numOfDownloads();
+ if ( httpSessionMgr->httpDownload() )
+ {
+ retVal = httpSessionMgr->httpDownload()->numOfDownloads();
+ }
break;
}
default:
--- a/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -763,7 +763,6 @@
state->SetCurrentInputMode(inputMode);
state->SetPermittedInputModes(permittedInputModes);
state->SetNumericKeymap(static_cast<TAknEditorNumericKeymap>(numericKeyMap));
- state->ReportAknEdStateEventL(MAknEdStateObserver::EAknSyncEdwinState);
state->ReportAknEdStateEventL(MAknEdStateObserver::EAknEdwinStateInputModeUpdate);
}
@@ -950,7 +949,7 @@
else
{
style->setProperty(CSS_PROP_COLOR, m_inputTextColor, false, ec);
- CancelEditingMode();
+ UpdateEditingMode();
return true;
}
}
--- a/webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.h Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.h Fri Mar 12 15:48:51 2010 +0200
@@ -175,6 +175,8 @@
* return
*/
WebScrollbarDrawer* scrollbarDrawer() {return m_scrollbarDrawer;}
+
+ WebScrollingDeceleratorGH* ScrollingDeceleratorGH() {return m_decelGH;}
//callbacks
static int pageOverviewScrollCallback( TAny* aPtr );
@@ -185,8 +187,6 @@
void handleTouchUpGH(const TStmGestureEvent& aGesture);
void updateScrollbars(const TPoint& scrollPos, TPoint& newscrollDelta);
-public:
-
private:
void calculateScrollDirection(int absX, int absY);
bool calculateScrollableFrameView(const TPoint& aNewPosition);
@@ -212,7 +212,7 @@
TTime m_lastMoveEventTime;
TTime m_pageOverviewEventTime;
WebScrollingDecelerator* m_decel;
- WebScrollingDeceleratorGH* m_decelGH;
+ WebScrollingDeceleratorGH* m_decelGH;
TPointerEvent m_lastDragEvent;
CPeriodic* m_scrollTimer;
ScrollableView m_scrollableView;
--- a/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -66,6 +66,7 @@
#include "Settings.h"
#include "WebGestureInterface.h"
#include "WebPagePinchZoomHandler.h"
+#include "WebScrollingDeceleratorGH.h"
#include "WebKitLogger.h"
using namespace WebCore;
@@ -350,7 +351,15 @@
m_webview->formFillPopup()->HandlePointerEventL(aPointerEvent);
return;
}
-
+
+ //if scrolling is going on, it need to be stopped immediately when user touches down
+ if (aPointerEvent.iType == TPointerEvent::EButton1Down && m_webview->viewIsScrolling()) {
+ WebScrollingDeceleratorGH* scrollDecelGH = m_webview->pageScrollHandler()->ScrollingDeceleratorGH();
+ if(scrollDecelGH) {
+ scrollDecelGH->cancelDecel();
+ }
+ }
+
#ifdef BRDO_USE_GESTURE_HELPER
m_gestureInterface->HandlePointerEventL(aPointerEvent);
#endif
--- a/webengine/osswebengine/WebKit/s60/webview/WebView.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebView.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -131,6 +131,8 @@
const int KZoomDefaultLevel = 8; //100%
const int defaultCacheCapacity = 256 * 1024;
+const int KMaxMissedDrawsAllowed = 5;//Max missed repaint allowed before paint happens
+
// LOCAL FUNCTION PROTOTYPES
TInt doRepaintCb( TAny* ptr );
TInt doFepCb( TAny* ptr );
@@ -203,6 +205,7 @@
, m_waitTimer(0)
, m_pinchZoomHandler(NULL)
, m_isPinchZoom(false)
+, m_drawsMissed(0)
{
}
@@ -630,7 +633,8 @@
layoutPending = false;
}
- if ( !layoutPending || !isLoading()) {
+ if ( !layoutPending || (m_drawsMissed >= KMaxMissedDrawsAllowed && !isLoading())) {
+ m_drawsMissed = 0;
bool needsDraw = false;
m_repaints.Tidy();
for (int i=0; i<m_repaints.Count(); ++i) {
@@ -653,6 +657,9 @@
// dont do next async repaint until KRepaintDelay
m_repaints.Clear();
}
+ else{
+ m_drawsMissed++;
+ }
m_repainttimer->Cancel();
// tot:fixme TBool complete = iWebkitControl->IsProgressComplete(); && CImageRendererFactory::Instance()->DecodeCount()==0;
@@ -2996,6 +3003,11 @@
}
m_currentZoomLevel = zoomLevel;
DrawNow();
+ PluginSkin* pluginskin = mainFrame()->focusedPlugin();
+ if(pluginskin)
+ {
+ pluginskin->deActivate();
+ }
}
//-------------------------------------------------------------------------------
--- a/webengine/osswebengine/WebKit/s60/webview/WebView.h Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebView.h Fri Mar 12 15:48:51 2010 +0200
@@ -601,6 +601,7 @@
WebPagePinchZoomHandler* m_pinchZoomHandler;
TBool m_isPinchZoom;
TRealPoint m_pinchDocDelta;
+ int m_drawsMissed;
};
#endif
--- a/webengine/osswebengine/webkit/s60/webview/WebGestureInterface.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/osswebengine/webkit/s60/webview/WebGestureInterface.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -21,6 +21,8 @@
#include "config.h"
#include "../../bidi.h"
#include <coemain.h>
+#include "brctl.h"
+#include <brctldefs.h>
#include "WebGestureInterface.h"
#include "WebView.h"
#include "WebPointerEventHandler.h"
@@ -107,7 +109,12 @@
gestureParams.SetEnabled(stmGesture::EGestureUidFlick, ETrue);
gestureParams.SetEnabled(stmGesture::EGestureUidLongPress, ETrue);
#ifdef BRDO_MULTITOUCH_ENABLED_FF
- gestureParams.SetEnabled(stmGesture::EGestureUidPinch, ETrue);
+ if (m_webview->brCtl()->capabilities() & TBrCtlDefs::ECapabilityPinchZoom) {
+ gestureParams.SetEnabled(stmGesture::EGestureUidPinch, ETrue);
+ }
+ else {
+ gestureParams.SetEnabled(stmGesture::EGestureUidPinch, EFalse);
+ }
#else
gestureParams.SetEnabled(stmGesture::EGestureUidPinch, EFalse);
#endif
@@ -165,3 +172,4 @@
}
+
--- a/webengine/webkitutils/HistoryProvider/HistoryController.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/webkitutils/HistoryProvider/HistoryController.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -169,7 +169,7 @@
case TBrCtlDefs::ECommandBack:
{
if (m_historyViewEnabled && m_backListAllowed) {
- showHistoryViewL(true);
+ showHistoryViewL(false);
}
else {
loadHistoryUrl( EHistoryStackDirectionPrevious, TBrCtlDefs::ECacheModeHistory, -1);
--- a/webengine/webkitutils/stmgesturefw/src/gesturehelpereventsender.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/webkitutils/stmgesturefw/src/gesturehelpereventsender.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -65,6 +65,12 @@
}
iEvents.Append(event);
+
+ if (event.Code() == stmGesture::EGestureUidTap) {
+ event.SetCode(stmGesture::EGestureUidRelease);
+ iEvents.Append(event);
+ }
+
if (iState != EBusy)
{
iState = EEventsReady;
@@ -101,7 +107,6 @@
}
iEvents.Reset();
iState = ENoEvents;
- Complete();
break;
}
}
--- a/webengine/widgetengine/src/Renderer.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/widgetengine/src/Renderer.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -223,25 +223,19 @@
void WidgetRenderer::drawFadeMaskL()
{
if (m_fademask) {
-
- CFbsBitmapDevice* dev = CFbsBitmapDevice::NewL(m_fademask);
- CleanupStack::PushL(dev);
-
- CFbsBitGc* gc;
- User::LeaveIfError(dev->CreateContext(gc));
m_fademask->LockHeap();
TSize s = m_fademask->SizeInPixels();
TUint8* data = (TUint8*)m_fademask->DataAddress();
- TUint8* end = data + s.iWidth*s.iHeight;
-
- while ( data<end ) {
- *(data++) = (255*m_transitioncount/m_maxtransitions);
+ if (data) {
+ TUint8* end = data + s.iWidth*s.iHeight;
+ while ( data<end ) {
+ *(data++) = (255*m_transitioncount/m_maxtransitions);
+ }
}
m_fademask->UnlockHeap();
- delete gc;
- CleanupStack::PopAndDestroy();
+
}
}
--- a/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h Fri Mar 12 15:48:51 2010 +0200
@@ -1,23 +1,18 @@
/*
-* ==============================================================================
-* Name : WidgetRegistryXml.h
-* Part of : Widget Registry
-* Interface : Widget Registry API
-* Description : This file contains the header file of the CWidgetBackupRegistryXml class.
-*
-* This class processes persistent registry data in XML.
-* Version : %version: %
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
-* Copyright © 2008 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
-* ==============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
*/
#ifndef WIDGETBACKUPREGISTRYXML_H
--- a/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -1,22 +1,23 @@
-//
-// ==============================================================================
-// Name : WidgetBackupRegistryXml.cpp
-// Part of : WidgetRegistry
-// Interface :
-// Description : Processes registry persistent data in XML.
-// Version : 5.0
-//
-// Copyright © 2008 Nokia Corporation.
-// This material, including documentation and any related
-// computer programs, is protected by copyright controlled by
-// Nokia Corporation. All rights are reserved. Copying,
-// including reproducing, storing, adapting or translating, any
-// or all of this material requires the prior written consent of
-// Nokia Corporation. This material also contains confidential
-// information which may not be disclosed to others without the
-// prior written consent of Nokia Corporation.
-// ==============================================================================
-///
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: This file contains the header file of the CMidletUI class.
+*
+* This class implements the ECom SWInstUIPluginAPI interface
+* for midlet installation.
+*
+*
+*/
// INCLUDE FILES
--- a/webengine/widgetregistry/Server/inc/WidgetMMCHandler.h Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetMMCHandler.h Fri Mar 12 15:48:51 2010 +0200
@@ -1,20 +1,20 @@
/*
-* ============================================================================
-* Name : WidgetMMCHandler.h
-* Part of : Widget Registry
-* Description : Acts on MMC card insertion/removal
-* Version : 3.1
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
-* Copyright © 2008 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
-* =============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: This file contains the header file of the CWidgetEntry class.
+*
+* This class implements the CWidgetEntry class.
+*
*/
#ifndef WIDGETMMCHANDLER_H
--- a/webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -1,24 +1,19 @@
-//
-// ============================================================================
-// Name : WidgetMMCHandler.cpp
-// Part of : SW Installer UIs / WidgetInstallerUI
-//
-// Description: Handle notifications of MMC events.
-//
-//
-// Version : 3.1
-//
-// Copyright © 2006 Nokia Corporation.
-// This material, including documentation and any related
-// computer programs, is protected by copyright controlled by
-// Nokia Corporation. All rights are reserved. Copying,
-// including reproducing, storing, adapting or translating, any
-// or all of this material requires the prior written consent of
-// Nokia Corporation. This material also contains confidential
-// information which may not be disclosed to others without the
-// prior written consent of Nokia Corporation.
-// ==============================================================================
-///
+/*
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Manages list of widget entries.
+*
+*/
// INCLUDE FILES
#include "WidgetMMCHandler.h"
--- a/webengine/widgetregistry/Server/src/WidgetRegistry.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetRegistry.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -776,13 +776,13 @@
TRAP( error, InsertL( entry ) );
if ( KErrNone != error )
{
- CleanupStack::PopAndDestroy( entry );
+ delete entry;
}
else
{
__ASSERT_DEBUG( res == entry, User::Invariant() );
// Entry was inserted successfully.
- CleanupStack::Pop( entry );
+ //CleanupStack::Pop( entry );
// add uid to AppArchList if not there,
// this can happend due to UID
// reallocation for UID collision resolution
@@ -802,14 +802,14 @@
{
// Pop and delete the un-needed entry so it is not left behind.
errorCount++;
- CleanupStack::PopAndDestroy( entry );
}
}
else
{
// entry error
- CleanupStack::PopAndDestroy( entry );
+ delete entry;
}
+ CleanupStack::Pop(); //entry
} // for
CleanupStack::PopAndDestroy( 2, &file ); // readStream, file
--- a/webengine/wmlengine/src/utils/src/nw_nvpair.c Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/wmlengine/src/utils/src/nw_nvpair.c Fri Mar 12 15:48:51 2010 +0200
@@ -146,7 +146,7 @@
NW_ASSERT( thisObj->strTable == NULL );
NW_ASSERT( name != NULL );
- if (name[0] == '\0' || value[0] == '\0') {
+ if (name[0] == '\0') {
return KBrsrSuccess;
}
--- a/webengine/wrtharvester/inc/wrtusbhandler.h Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/wrtharvester/inc/wrtusbhandler.h Fri Mar 12 15:48:51 2010 +0200
@@ -1,20 +1,18 @@
/*
-* ============================================================================
-* Name : WrtUsbHandler.h
-* Part of : Widget Registry
-* Description : Acts on MMC card insertion/removal
-* Version : 3.1
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
-* Copyright © 2008 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
-* =============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
*/
#ifndef WIDGETMMCHANDLER_H
--- a/webengine/wrtharvester/rom/wrtharvesterResources.iby Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/wrtharvester/rom/wrtharvesterResources.iby Fri Mar 12 15:48:51 2010 +0200
@@ -1,20 +1,18 @@
/*
-* =============================================================================
-* Name : wrtharvesterResources.iby
-* Part of :
-* Description : The resource iby file contains resource that needs to be
-* localized for wrtharvester
-* Version : %version: 1 %
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
-* Copyright (c) 2009 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-* ============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: IBY file
+*
*/
#ifndef WRTHARVESTERRESOURCES_IBY
--- a/webengine/wrtharvester/src/wrtusbhandler.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/webengine/wrtharvester/src/wrtusbhandler.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -1,24 +1,19 @@
-//
-// ============================================================================
-// Name : WidgetMMCHandler.cpp
-// Part of : SW Installer UIs / WidgetInstallerUI
-//
-// Description: Handle notifications of MMC events.
-//
-//
-// Version : 3.1
-//
-// Copyright © 2006 Nokia Corporation.
-// This material, including documentation and any related
-// computer programs, is protected by copyright controlled by
-// Nokia Corporation. All rights are reserved. Copying,
-// including reproducing, storing, adapting or translating, any
-// or all of this material requires the prior written consent of
-// Nokia Corporation. This material also contains confidential
-// information which may not be disclosed to others without the
-// prior written consent of Nokia Corporation.
-// ==============================================================================
-///
+/*
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
// INCLUDE FILES
#include "wrtusbhandler.h"
--- a/widgets/widgetapp/inc/WidgetUiNetworkListener.h Fri Feb 19 23:55:03 2010 +0200
+++ b/widgets/widgetapp/inc/WidgetUiNetworkListener.h Fri Mar 12 15:48:51 2010 +0200
@@ -1,22 +1,19 @@
-//
-//==============================================================================
-// Name : WidgetUiNetworkListener.h
-// Part of : WidgetUI
-// Interface :
-// Description :
-// Version : %version: 5.1.1.3.3 %
-//
-// Copyright 2008, 2009 Nokia Corporation.
-// This material, including documentation and any related
-// computer programs, is protected by copyright controlled by
-// Nokia Corporation. All rights are reserved. Copying,
-// including reproducing, storing, adapting or translating, any
-// or all of this material requires the prior written consent of
-// Nokia Corporation. This material also contains confidential
-// information which may not be disclosed to others without the
-// prior written consent of Nokia Corporation.
-//==============================================================================
-//
+/*
+* Copyright (c) 2008, 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
#ifndef WIDGETUINETWORKLISTENER_H_
#define WIDGETUINETWORKLISTENER_H_
--- a/widgets/widgetapp/src/WidgetUiNetworkListener.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/widgets/widgetapp/src/WidgetUiNetworkListener.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -1,22 +1,19 @@
-//
-//==============================================================================
-// Name : WidgetUiNetworkListener.cpp
-// Part of : WidgetUI
-// Interface :
-// Description :
-// Version : %version: 5.1.1.3.3 %
-//
-// Copyright 2008, 2009 Nokia Corporation.
-// This material, including documentation and any related
-// computer programs, is protected by copyright controlled by
-// Nokia Corporation. All rights are reserved. Copying,
-// including reproducing, storing, adapting or translating, any
-// or all of this material requires the prior written consent of
-// Nokia Corporation. This material also contains confidential
-// information which may not be disclosed to others without the
-// prior written consent of Nokia Corporation.
-//==============================================================================
-//
+/*
+* Copyright (c) 2008, 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
#include "WidgetUiNetworkListener.h"
--- a/widgets/widgetapp/src/WidgetUiObserver.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/widgets/widgetapp/src/WidgetUiObserver.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -468,7 +468,8 @@
if ( ret == KErrNone &&
( dataType.iConfidence == CApaDataRecognizerType::ECertain ) ||
- ( dataType.iConfidence == CApaDataRecognizerType::EProbable ) )
+ ( dataType.iConfidence == CApaDataRecognizerType::EProbable) ||
+ ( dataType.iConfidence == CApaDataRecognizerType::EPossible) )
{
// If the file type was found, try to match it to a known file type
contentTypeString->Des().Copy( mimeTypePtr );
--- a/widgets/widgetapp/src/WidgetUiWindow.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/widgets/widgetapp/src/WidgetUiWindow.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -872,6 +872,7 @@
EMiniViewNotEnabled == WidgetMiniViewState()) )
{
iCpsPublisher->NetworkConnectionCancelledL();
+ iNetworkModeWait->Start();
}
#endif
User::Leave( connFailure );
--- a/widgets/widgetinstaller/src/WidgetUIOperationsWatcher.cpp Fri Feb 19 23:55:03 2010 +0200
+++ b/widgets/widgetinstaller/src/WidgetUIOperationsWatcher.cpp Fri Mar 12 15:48:51 2010 +0200
@@ -768,8 +768,8 @@
if ( iOverwriting )
{
TUid uid = TUid::Uid( *(iPropertyValues[EUid]) );
+ iAppManager->DeregisterWidgetL( uid );
iRegistry.DeRegisterWidgetL( uid );
- iAppManager->DeregisterWidgetL( uid );
}
// TODO if registration steps fail does it leave inconsistent state???
@@ -1020,8 +1020,8 @@
CleanupStack::PopAndDestroy(fileName);
}
+ iAppManager->DeregisterWidgetL( aUid );
iRegistry.DeRegisterWidgetL( aUid );
- iAppManager->DeregisterWidgetL( aUid );
TInt err = KErrNone;
TRAP(err, FinishUninstallL( KErrNone ));
if(err == KErrNone)