# HG changeset patch # User William Roberts # Date 1268572333 0 # Node ID 93bab755042a79adca93556b0061c110ac0bb065 # Parent c8a95d3dcd7138bc8c6faf1f17e243a713c5bc70# Parent 4ac3198c2c5b464b1086282cddc7eb3c4cb0c469 Automatic merge from PDK_3.0.h diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/jsapi/platformservices/src/messaging.js --- a/serviceproviders/jsapi/platformservices/src/messaging.js Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/jsapi/platformservices/src/messaging.js Sun Mar 14 13:12:13 2010 +0000 @@ -782,10 +782,6 @@ throw new DeviceException(this.error.DATA_OUT_OF_RANGE_ERR, "Messaging:startEditor:subject is too lengthy");//SErrMissingArgument = 1003 } } - if (message.to == undefined || message.to == null) { - // a("starteditor4"); - throw new DeviceException(this.error.MISSING_ARG_ERR, "Messaging:startEditor:to field is missing");//SErrMissingArgument = 1003 - } if (message.attachments != undefined && message.attachments != null && typeof message.attachments != "object") { // a("INVALID_ARG_ERR"); diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_applicationmanager/data/appmanagerprovidername.rss --- a/serviceproviders/sapi_applicationmanager/data/appmanagerprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_applicationmanager/data/appmanagerprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME AMgr #include -#include +#include #include #include #include diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_calendar/data/calendarprovidername.rss --- a/serviceproviders/sapi_calendar/data/calendarprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_calendar/data/calendarprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME Cndr #include -#include +#include #include #include #include diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_contacts_vpbk/data/contactprovidername.rss --- a/serviceproviders/sapi_contacts_vpbk/data/contactprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_contacts_vpbk/data/contactprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME Cont #include -#include +#include #include #include #include diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_landmarks/data/landmarkprovidername.rss --- a/serviceproviders/sapi_landmarks/data/landmarkprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_landmarks/data/landmarkprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME Ldmk #include -#include +#include #include #include #include diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_location/data/locationprovidername.rss --- a/serviceproviders/sapi_location/data/locationprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_location/data/locationprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME locn #include -#include +#include #include #include #include diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_logging/data/loggingprovidername.rss --- a/serviceproviders/sapi_logging/data/loggingprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_logging/data/loggingprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME lgng #include -#include +#include #include #include #include diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_mediamanagement/data/mediamanagementprovidername.rss --- a/serviceproviders/sapi_mediamanagement/data/mediamanagementprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_mediamanagement/data/mediamanagementprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME Cont #include -#include +#include #include #include #include diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_messaging/data/messagingprovidername.rss --- a/serviceproviders/sapi_messaging/data/messagingprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_messaging/data/messagingprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME Msg #include -#include +#include #include #include #include diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_messaging/src/messaginginterface.cpp --- a/serviceproviders/sapi_messaging/src/messaginginterface.cpp Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_messaging/src/messaginginterface.cpp Sun Mar 14 13:12:13 2010 +0000 @@ -792,6 +792,7 @@ TInt pos = 0; TBool indexBaseInp = ETrue; + TBool isToPresent = ETrue; const TLiwGenericParam* inMessageType = aInParamList.FindFirst( pos, KMtm ); if ( inMessageType ) @@ -851,7 +852,7 @@ } else { - AppendErrorMessageL( KCmdSendMessage, KRecipientTo, KMissing, 1 ); + isToPresent = EFalse; } // Read BodyText @@ -993,6 +994,11 @@ //this is an optional parameter so check for not null constraint, ignore this in case of NULL if ( inMap->FindL( KLaunchEditor, inParam ) && CheckInputTypeL( &inParam, EFalse, LIW::EVariantTypeTBool, KCmdSendMessage, KLaunchEditor, KTypeInvalid ) ) { + if(!isToPresent && !(inParam.AsTBool())) + { + CleanupStack::PopAndDestroy( &inParam ); + AppendErrorMessageL( KCmdSendMessage, KRecipientTo, KMissing, 1 ); + } sendParams->SetLaunchEditor( inParam.AsTBool() ); } diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_sensor/data/sensorprovidername.rss --- a/serviceproviders/sapi_sensor/data/sensorprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_sensor/data/sensorprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME Snsr #include -#include +#include #include #include #include diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_serviceregistry/data/serviceregistryprovidername.rss --- a/serviceproviders/sapi_serviceregistry/data/serviceregistryprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_serviceregistry/data/serviceregistryprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME Cont #include -#include +#include #include #include #include diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg --- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg Sun Mar 14 13:12:13 2010 +0000 @@ -1,7 +1,7 @@ [Test] title GetContactDataList create tserviceregistrytest testModule -testModule GetMetaDataListL 0 0 InputStart ServiceName Service.Contact InterfaceName IDataSource MinimumVersion 1.0 MaximumVersion 5.0 InputEnd ExpectedStart StartMap ServiceName Service.Contact InterfaceName IDataSource VersionList 1.1 EndMap ExpectedEnd +testModule GetMetaDataListL 0 0 InputStart ServiceName Service.Contact InterfaceName IDataSource MinimumVersion 1.0 MaximumVersion 5.0 InputEnd ExpectedStart StartMap ServiceName Service.Contact InterfaceName IDataSource VersionList 2.0 EndMap ExpectedEnd delete testModule [Endtest] @@ -9,7 +9,7 @@ [Test] title GetAllDataList create tserviceregistrytest testModule -testModule GetMetaDataListL 0 0 ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService MinimumVersion 1.1 EndMap StartMap ServiceName Service.contact InterfaceName IDataSource VersionList 1.1 EndMap ExpectedEnd +testModule GetMetaDataListL 0 0 ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService MinimumVersion 1.1 EndMap StartMap ServiceName Service.contact InterfaceName IDataSource VersionList 2.0 EndMap ExpectedEnd delete testModule [Endtest] @@ -24,7 +24,7 @@ [Test] title GetServiceNameDataList create tserviceregistrytest testModule -testModule GetMetaDataListL 0 0 InputStart ServiceName Service.ServiceRegistry InputEnd ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService VersionList 1.1 EndMap ExpectedEnd +testModule GetMetaDataListL 0 0 InputStart ServiceName Service.ServiceRegistry InputEnd ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService VersionList 2.0 EndMap ExpectedEnd delete testModule [Endtest] diff -r c8a95d3dcd71 -r 93bab755042a serviceproviders/sapi_sysinfo/data/sysinfoprovidername.rss --- a/serviceproviders/sapi_sysinfo/data/sysinfoprovidername.rss Mon Mar 08 21:44:14 2010 +0000 +++ b/serviceproviders/sapi_sysinfo/data/sysinfoprovidername.rss Sun Mar 14 13:12:13 2010 +0000 @@ -20,7 +20,7 @@ NAME Isys #include -#include +#include #include #include #include