--- a/serviceproviders/jsapi/platformservices/src/messaging.js Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/jsapi/platformservices/src/messaging.js Fri Feb 19 23:43:21 2010 +0200
@@ -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");
--- a/serviceproviders/sapi_applicationmanager/data/appmanagerprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_applicationmanager/data/appmanagerprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME AMgr
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>
--- a/serviceproviders/sapi_calendar/data/calendarprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_calendar/data/calendarprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME Cndr
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>
--- a/serviceproviders/sapi_contacts_vpbk/data/contactprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_contacts_vpbk/data/contactprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME Cont
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>
--- a/serviceproviders/sapi_landmarks/data/landmarkprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_landmarks/data/landmarkprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME Ldmk
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>
--- a/serviceproviders/sapi_location/data/locationprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_location/data/locationprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME locn
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>
--- a/serviceproviders/sapi_logging/data/loggingprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_logging/data/loggingprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME lgng
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>
--- a/serviceproviders/sapi_mediamanagement/data/mediamanagementprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_mediamanagement/data/mediamanagementprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME Cont
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>
--- a/serviceproviders/sapi_messaging/data/messagingprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_messaging/data/messagingprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME Msg
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>
--- a/serviceproviders/sapi_messaging/src/messaginginterface.cpp Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_messaging/src/messaginginterface.cpp Fri Feb 19 23:43:21 2010 +0200
@@ -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() );
}
--- a/serviceproviders/sapi_sensor/data/sensorprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sensor/data/sensorprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME Snsr
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>
--- a/serviceproviders/sapi_serviceregistry/data/serviceregistryprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_serviceregistry/data/serviceregistryprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME Cont
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>
--- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg Fri Feb 19 23:43:21 2010 +0200
@@ -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]
--- a/serviceproviders/sapi_sysinfo/data/sysinfoprovidername.rss Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/data/sysinfoprovidername.rss Fri Feb 19 23:43:21 2010 +0200
@@ -20,7 +20,7 @@
NAME Isys
#include <eikon.rh>
-#include <eikcore.rsg>
+#include <EIKCORE.rsg>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.hrh>