# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268984540 -7200
# Node ID e7cb6cffd49afa4bf4d5216957e472641d6504cd
# Parent  92cfb77afb610d4c334e48575c06b4f6a53803bb
Revision: 201005
Kit: 201011

diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/group/bld.inf
--- a/serviceproviders/group/bld.inf	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/group/bld.inf	Fri Mar 19 09:42:20 2010 +0200
@@ -17,15 +17,15 @@
 
 #include <platform_paths.hrh>
 
-#include "../sapi_contacts_vpbk/group/bld.inf"
+//#include "../sapi_contacts_vpbk/group/bld.inf"
 #include "../sapi_location/group/bld.inf"
 #include "../sapi_mediamanagement/group/bld.inf"
 #include "../sapi_landmarks/group/bld.inf"
 //#include "../camera/group/bld.inf"
-#include "../sapi_messaging/group/bld.inf"
+//#include "../sapi_messaging/group/bld.inf"
 
-#include "../sapi_applicationmanager/group/bld.inf"
-#include "../sapi_calendar/group/bld.inf"
+//#include "../sapi_applicationmanager/group/bld.inf"
+//#include "../sapi_calendar/group/bld.inf"
 #include "../sapi_logging/group/bld.inf"
 #include "../sapi_sensor/group/bld.inf"
 #include "../sapi_sysinfo/group/bld.inf"
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/jsapi/platformservices/src/messaging.js
--- a/serviceproviders/jsapi/platformservices/src/messaging.js	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/jsapi/platformservices/src/messaging.js	Fri Mar 19 09:42:20 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");
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_applicationmanager/data/appmanagerprovidername.rss
--- a/serviceproviders/sapi_applicationmanager/data/appmanagerprovidername.rss	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_applicationmanager/data/appmanagerprovidername.rss	Fri Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_calendar/data/calendarprovidername.rss
--- a/serviceproviders/sapi_calendar/data/calendarprovidername.rss	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_calendar/data/calendarprovidername.rss	Fri Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_contacts_vpbk/data/contactprovidername.rss
--- 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 Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_landmarks/data/landmarkprovidername.rss
--- a/serviceproviders/sapi_landmarks/data/landmarkprovidername.rss	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_landmarks/data/landmarkprovidername.rss	Fri Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkdummyao.cpp
--- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkdummyao.cpp	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkdummyao.cpp	Fri Mar 19 09:42:20 2010 +0200
@@ -74,20 +74,20 @@
 	    }
 	else*/
 	    //{
-        switch(iCmd)
-         {
-         case EAdd: TRAP_IGNORE(iObserver->HandleAddItemsL(iId,iTransactionId,iStatus.Int()));
-                    break;
-         case EUpdate:
-         case ERemove: TRAP_IGNORE(iObserver->HandleItemsL(iTransactionId,iStatus.Int()));
-                        break;
-         default:
-             break;
-         }
-        
-        if (!iManageObjects->IsActive())
-            {
-            iManageObjects->Start();
+	switch(iCmd)
+	 {
+	 case EAdd: TRAP_IGNORE(iObserver->HandleAddItemsL(iId,iTransactionId,iStatus.Int()));
+				break;
+	 case EUpdate:
+	 case ERemove: TRAP_IGNORE(iObserver->HandleItemsL(iTransactionId,iStatus.Int()));
+	 				break;
+	 default:
+		 break;
+	 }
+	
+	if (!iManageObjects->IsActive())
+		{
+		iManageObjects->Start();
             }
        // }
 	}
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_location/data/locationprovidername.rss
--- a/serviceproviders/sapi_location/data/locationprovidername.rss	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_location/data/locationprovidername.rss	Fri Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_logging/data/loggingprovidername.rss
--- a/serviceproviders/sapi_logging/data/loggingprovidername.rss	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_logging/data/loggingprovidername.rss	Fri Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_mediamanagement/data/mediamanagementprovidername.rss
--- a/serviceproviders/sapi_mediamanagement/data/mediamanagementprovidername.rss	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_mediamanagement/data/mediamanagementprovidername.rss	Fri Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_messaging/data/messagingprovidername.rss
--- a/serviceproviders/sapi_messaging/data/messagingprovidername.rss	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_messaging/data/messagingprovidername.rss	Fri Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_messaging/src/messaginginterface.cpp
--- a/serviceproviders/sapi_messaging/src/messaginginterface.cpp	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_messaging/src/messaginginterface.cpp	Fri Mar 19 09:42:20 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() );
 				}
 			
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sensor/data/sensorprovidername.rss
--- a/serviceproviders/sapi_sensor/data/sensorprovidername.rss	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sensor/data/sensorprovidername.rss	Fri Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_serviceregistry/data/serviceregistryprovidername.rss
--- a/serviceproviders/sapi_serviceregistry/data/serviceregistryprovidername.rss	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_serviceregistry/data/serviceregistryprovidername.rss	Fri Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/data/sysinfoprovidername.rss
--- a/serviceproviders/sapi_sysinfo/data/sysinfoprovidername.rss	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/data/sysinfoprovidername.rss	Fri Mar 19 09:42:20 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>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/inc/sysinfoaiwparams.hrh
--- a/serviceproviders/sapi_sysinfo/inc/sysinfoaiwparams.hrh	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/inc/sysinfoaiwparams.hrh	Fri Mar 19 09:42:20 2010 +0200
@@ -145,13 +145,6 @@
 _LIT8(KCamResList,"ResolutionList");
 
 _LIT8(KCamMimeTypesList,"MimeTypeList");
-
-_LIT8(KCapability, "capability");
-_LIT8(KDecManufacturer, "manufacturer");
-_LIT8(KIdentifier, "identifier");
-_LIT8(KAccelerated, "accelerated");
-_LIT8(KMaxBitrate, "maxBitrate");
-_LIT8(KVersion, "version");
 }
 
-#endif //__SYSINFO_AIWPARAMS_HRH_
+#endif //__SYSINFO_AIWPARAMS_HRH_
\ No newline at end of file
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp
--- a/serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp	Fri Mar 19 09:42:20 2010 +0200
@@ -876,40 +876,7 @@
             CleanupStack::PopAndDestroy( camResList );
             }
             break; 
-        case CSysData::EVideoDecList:
-            {
-            CLiwList* decResList = CLiwDefaultList::NewL();
-            CleanupClosePushL( *decResList );
-            const CVideoDecDataList* declist = ((CVideoDecDataList*) aInSysData);
-            count = declist->Count();
-            CVideoDecDataList::CVideoDecData * decinfo = NULL;
-            
-            for ( int index=0; index<count; index++ )
-                {
-                TInt val = 0;
-                CLiwMap* resMap = CLiwDefaultMap::NewL();
-                CleanupStack::PushL( resMap );
-                decinfo=(*declist)[index];
-                TPtrC temp;
-                temp.Set(*(decinfo->Manufacturer));
-                TPtrC temp1;
-                temp1.Set(*(decinfo->Identifier));
-                
-                resMap->InsertL( KDecManufacturer, temp );
-                resMap->InsertL( KIdentifier, temp1 );
-                resMap->InsertL( KMaxBitrate, (TInt32)decinfo->MaxBitrate );
-                resMap->InsertL( KAccelerated, (TBool)decinfo->Accelerated );
-                resMap->InsertL( KVersion, decinfo->Version );
-                
-                decResList->AppendL( resMap );
-                CleanupStack::Pop( resMap );
-                resMap->Close();
-                }
-            aOutMapParam->InsertL( KCapability, decResList );
-            CleanupStack::PopAndDestroy( decResList );
-            //aOutMapParam->InsertL( KCapability, 1 );
-            }
-            break; 
+
         default:
             User::Leave(KErrArgument);
         }
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/sysinfoservice/bwins/sysinfoserviceu.def
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/bwins/sysinfoserviceu.def	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/bwins/sysinfoserviceu.def	Fri Mar 19 09:42:20 2010 +0200
@@ -60,6 +60,4 @@
 	?Count@CCameraResolutionList@@QBEHXZ @ 59 NONAME ; int CCameraResolutionList::Count(void) const
 	?MimeTypesList@CCameraInfo@@QBEPAVCStringList@@XZ @ 60 NONAME ; class CStringList * CCameraInfo::MimeTypesList(void) const
 	?ResolutionList@CCameraInfo@@QBEPAVCCameraResolutionList@@XZ @ 61 NONAME ; class CCameraResolutionList * CCameraInfo::ResolutionList(void) const
-	??ACVideoDecDataList@@QBEPAUCVideoDecData@0@H@Z @ 62 NONAME ; struct CVideoDecDataList::CVideoDecData * CVideoDecDataList::operator[](int) const
-	?Count@CVideoDecDataList@@QBEHXZ @ 63 NONAME ; int CVideoDecDataList::Count(void) const
 
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/sysinfoservice/eabi/sysinfoserviceu.def
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/eabi/sysinfoserviceu.def	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/eabi/sysinfoserviceu.def	Fri Mar 19 09:42:20 2010 +0200
@@ -60,6 +60,4 @@
 	_ZNK21CCameraResolutionList2AtEiiRi @ 59 NONAME
 	_ZNK21CCameraResolutionList5CountEv @ 60 NONAME
 	_ZNK21CCameraResolutionListixEi @ 61 NONAME
-	_ZNK17CVideoDecDataList5CountEv @ 62 NONAME
-	_ZNK17CVideoDecDataListixEi @ 63 NONAME
 
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp	Fri Mar 19 09:42:20 2010 +0200
@@ -66,7 +66,7 @@
 LIBRARY	  		PlatformEnv.lib
 LIBRARY			ImagingConfigManager.lib
 LIBRARY                   Avkon.lib  // PhoneLanguage
-LIBRARY                   estlib.lib devvideo.lib  //strlen function
+LIBRARY                   estlib.lib  //strlen function
 
 paged
 
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/sysinfoservice/inc/entitykeys.h
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/entitykeys.h	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/entitykeys.h	Fri Mar 19 09:42:20 2010 +0200
@@ -62,7 +62,7 @@
 _LIT(KActiveConnections,"ActiveConnections");
 _LIT(KConnectionStatus,	"ConnectionStatus");
 _LIT(KWLanMacAddress,	"WLanMacAddress");
-_LIT(KWirelessConnSupport, "WirelessConnSupport");
+
 
 _LIT(KCamera,			"Camera");
 _LIT(KMemoryCard,		"MemoryCard");
@@ -75,14 +75,7 @@
 _LIT(KCoverUI,			"CoverUI");
 _LIT(KSideVolumeKeys,	"SideVolumeKeys");
 _LIT(KVibra,			"Vibra");
-_LIT(KVideoDecoder,     "VideoDecoder");
 
-_LIT(KBT, "Bluetooth");
-_LIT(KIrda, "Irda");
-_LIT(KWlan, "Wlan");
-_LIT(KGsm, "Gsm");
-_LIT(KWcdma, "Wcdma");
-_LIT(KCdma, "Cdma");
 
 _LIT(KBrightness,		"Brightness");
 _LIT(KPowerSaverTimeOut,"PowerSaverTimeOut");
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h	Fri Mar 19 09:42:20 2010 +0200
@@ -53,8 +53,7 @@
         EResolution,
         EStringList,
         EStringData,
-        ECameraInfo,
-        EVideoDecList
+        ECameraInfo
         };
     public:
     /**
@@ -923,65 +922,5 @@
     CCameraResolutionList* iResList;
     CStringList* iMimeTypesList;
     };
-/**
-*  @ref CVideoDecDataList
-*
-*  @lib sysinfoservice.lib
-*  @since S60 3.2
-*/
-NONSHARABLE_CLASS(CVideoDecDataList) : public CSysData
-    {
-    public:
-    struct CVideoDecData
-    {
-        CVideoDecData(const TDesC  &iManufacturer,const TDesC  &iIdentifier,TInt iMaxBitrate,TBool    iAccelerated,const TDesC &iVersion)
-                :MaxBitrate(iMaxBitrate),Accelerated(iAccelerated)
-                    {
-                    Manufacturer = iManufacturer.AllocL();
-                    Identifier = iIdentifier.AllocL();
-                    Version=iVersion.AllocL();
-                    }
-        
-        TInt     MaxBitrate;
-        TBool    Accelerated;  
-        HBufC*      Manufacturer;
-        HBufC*      Identifier;
-        HBufC*      Version;
-    };
-    public:
-    /**
-    * Two-phased constructor.
-    *
-    * @return A new instance of this class.
-    */    
-    static CVideoDecDataList* NewL();
-    /**
-    * @return drive number.
-    */
-    void AppendL(CVideoDecData *entry);
-    IMPORT_C CVideoDecData *operator[](TInt aIndex) const;
-    /**
-    * @return number of drives.
-    */
-    IMPORT_C TInt Count() const;
 
-    /**
-    * Destructor.
-    */
-    ~CVideoDecDataList();
-
-    private:
-    /**
-    * C++ default constructor.
-    */
-    CVideoDecDataList();
-    /**
-    * Symbian 2nd phase constructor.
-    */
-    void ConstructL();
-    
-    private:
-    RArray<CVideoDecData *>    iDecData;
-    TInt            iCount;
-};
 #endif __SYSINFO_H__
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoservice.h
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoservice.h	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoservice.h	Fri Mar 19 09:42:20 2010 +0200
@@ -23,7 +23,6 @@
 #include "sysinfo.h"
 #include "sysrequest.h"
 #include "imagingconfigmanager.h"
-#include <mmf\devvideo\devvideoplay.h >
 
 // FORWORD CLASS DECLARATION
 class CSysData;
@@ -293,47 +292,6 @@
     CDeviceInfo*    iDeviceInfo;
     };
 
-/**
-*   @ref MMMFDevVideoPlayObserverImpl is used as video observer
-*
-*   @lib sysinfoservice
-*   @since S60 9.2
-*   @version $Revision: 1.0 $
-*/
-class MMMFDevVideoPlayObserverImpl : public MMMFDevVideoPlayObserver
-    {
-    public:
-
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoNewBuffers() {}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoReturnPicture(TVideoPicture* ) {}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoSupplementalInformation(const TDesC8& , 
-                                              const TTimeIntervalMicroSeconds& , 
-                                              const TPictureId& ) {}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoPictureLoss() {}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoPictureLoss(const TArray<TPictureId>& ) {}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoSliceLoss(TUint , TUint , const TPictureId& ){}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoReferencePictureSelection(const TDesC8& ){}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoTimedSnapshotComplete(TInt , 
-                                            TPictureData* , 
-                                            const TTimeIntervalMicroSeconds& , 
-                                            const TPictureId& ){}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoNewPictures() {}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoFatalError(TInt ) {}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoInitComplete(TInt ) {}
-    /*   Dummy implementation for virtual function  */
-    virtual void MdvpoStreamEnd() {}
-    };
 
 #endif __CSYSINFOSERVICE_H__
 
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/sysinfoservice/src/activerequests.cpp
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/activerequests.cpp	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/activerequests.cpp	Fri Mar 19 09:42:20 2010 +0200
@@ -25,7 +25,7 @@
 #include <sysutildomaincrkeys.h>
 
 #include <UikonInternalPSKeys.h>
-#include <NetworkHandlingDomainPSKeys.h>
+#include <networkhandlingdomainpskeys.h>
 #include <hwrmdomainpskeys.h>
 #include <hwrmpowerstatesdkpskeys.h>
 #include <ir_sock.h>
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp	Fri Mar 19 09:42:20 2010 +0200
@@ -1386,75 +1386,5 @@
     {
     return iMimeTypesList;
     }
-
-// --------------------------------------------------------------------
-// CVideoDecDataList::CVideoDecDataList()
-// Constructor.
-// --------------------------------------------------------------------
-//
-CVideoDecDataList::CVideoDecDataList():CSysData(EVideoDecList)
-    {
-    }
-
-// --------------------------------------------------------------------
-// CDriveList::~CDriveList()
-// Destructor
-// --------------------------------------------------------------------
-//
-CVideoDecDataList::~CVideoDecDataList()
-    {
-    for(int i=0;i<iDecData.Count();i++)
-        delete iDecData[i];
-    }
-
-// --------------------------------------------------------------------
-// CDriveList::NewL()
-// Two-phased constructor. returns new instance of this class.
-// --------------------------------------------------------------------
-//
-CVideoDecDataList* CVideoDecDataList::NewL()
-    {
-    CVideoDecDataList* self;
-    self = new (ELeave) CVideoDecDataList();
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// --------------------------------------------------------------------
-// CDriveList::ConstructL()
-// 2nd phase construtor
-// --------------------------------------------------------------------
-//
-void CVideoDecDataList::ConstructL()
-    {
-    }
-
-void CVideoDecDataList::AppendL(CVideoDecData *entry)
-    {
-    iDecData.AppendL(entry);
-    }
-// --------------------------------------------------------------------
-// CDriveList::[]
-// gets drive number at specified index.
-// --------------------------------------------------------------------
-//
-EXPORT_C CVideoDecDataList::CVideoDecData *CVideoDecDataList::operator[](TInt aIndex) const
-    {
-    if(0 <= aIndex && aIndex<iDecData.Count())
-        return iDecData[aIndex];
-    else
-        return NULL;
-    }
-
-// --------------------------------------------------------------------
-// CDriveList::Count
-// returns number of drives.
-// --------------------------------------------------------------------
-//
-EXPORT_C TInt CVideoDecDataList::Count() const
-    {
-    return iDecData.Count();
-    }
+	
 // End of file.		
diff -r 92cfb77afb61 -r e7cb6cffd49a serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp	Tue Feb 02 00:45:40 2010 +0200
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp	Fri Mar 19 09:42:20 2010 +0200
@@ -35,7 +35,7 @@
 
 #include <e32property.h>
 #include <hwrmdomainpskeys.h>
-#include <NetworkHandlingDomainPSKeys.h>
+#include <networkhandlingdomainpskeys.h>
 #include <hwrmpowerstatesdkpskeys.h>
 #include <wlaninternalpskeys.h>
 #include <UikonInternalPSKeys.h>
@@ -444,7 +444,7 @@
         User::LeaveIfError(RProperty::Get(KPSUidNetworkInfo,
                                     KNWRegistrationStatus,status));
         }
-    else if( !aKey.CompareF(SysInfo::KNetworkMode) )
+    else if( !aKey.CompareF(KNetworkMode) )
         {
         User::LeaveIfError(RProperty::Get(KPSUidNetworkInfo,
                                     KNWTelephonyNetworkMode,status));
@@ -579,28 +579,6 @@
         featureID = KFeatureIdSideVolumeKeys;
     else if( !aKey.CompareF(KVibra) )
         featureID = KFeatureIdVibra;
-    else if( !aKey.CompareF(KVideoDecoder) )
-        {
-        MMMFDevVideoPlayObserverImpl obsImpl;
-        RArray<TUid> aDecoders;
-        CMMFDevVideoPlay *videoPlay=CMMFDevVideoPlay::NewL(obsImpl);
-        //place object on cleanupstack.
-        CleanupStack::PushL(videoPlay);
-        
-        videoPlay->GetDecoderListL(aDecoders);
-        CVideoDecDataList *decDataList=CVideoDecDataList::NewL();
-        for(int i=0;i<aDecoders.Count();i++)
-            {
-            CVideoDecoderInfo *decoderInfo=videoPlay->VideoDecoderInfoLC(aDecoders[i]);
-            CVideoDecDataList::CVideoDecData *data=new CVideoDecDataList::CVideoDecData(decoderInfo->Manufacturer(),decoderInfo->Identifier(),decoderInfo->MaxBitrate(),decoderInfo->Accelerated(),decoderInfo->Version().Name());
-            decDataList->AppendL(data);
-            CleanupStack::PopAndDestroy(decoderInfo);
-            }
-        
-        aSysData = decDataList;
-        CleanupStack::PopAndDestroy(videoPlay);
-        return;     
-        }
     else
         User::Leave(KErrNotFound);
 
@@ -689,48 +667,6 @@
             }  
         aSysData = CStringData::NewL(FormatedMacAddress);
         }
-    else if( !aKey.CompareF(KWirelessConnSupport) )
-        {
-        CDesCArray*     connTypesDesArray;
-        connTypesDesArray = new (ELeave) CDesCArrayFlat(4);
-        CleanupStack::PushL(connTypesDesArray);
-
-         //Initialize the feature manager if not already done.
-         if (!iFeatureManagerInitialized)
-         {
-             FeatureManager::InitializeLibL();
-             iFeatureManagerInitialized = ETrue;
-         }
-         
-         if(FeatureManager::FeatureSupported(KFeatureIdBt))
-             {
-             connTypesDesArray->AppendL(KBT);
-             }
-         if(FeatureManager::FeatureSupported(KFeatureIdIrda))
-             {
-             connTypesDesArray->AppendL(KIrda);
-             }
-         if(FeatureManager::FeatureSupported(KFeatureIdProtocolWlan))
-             {
-             connTypesDesArray->AppendL(KWlan);
-             }
-         if(FeatureManager::FeatureSupported(KFeatureIdProtocolGsm))
-             {
-             connTypesDesArray->AppendL(KGsm);
-             }
-         if(FeatureManager::FeatureSupported(KFeatureIdProtocolWcdma))
-             {
-             connTypesDesArray->AppendL(KWcdma);
-             }
-         if(FeatureManager::FeatureSupported(KFeatureIdProtocolCdma))
-             {
-             connTypesDesArray->AppendL(KCdma);
-             }
-
-        //connTypesDesArray ownership passed to CStringList.
-        aSysData = CStringList::NewL(connTypesDesArray);
-        CleanupStack::Pop(connTypesDesArray);         
-        }
     else
         User::Leave(KErrNotFound);
     }
diff -r 92cfb77afb61 -r e7cb6cffd49a tsrc/group/bld.inf
--- a/tsrc/group/bld.inf	Tue Feb 02 00:45:40 2010 +0200
+++ b/tsrc/group/bld.inf	Fri Mar 19 09:42:20 2010 +0200
@@ -19,15 +19,15 @@
 
 // *****************mediagallery related testapps***********************
 #include "../../serviceproviders/sapi_landmarks/tsrc/group/bld.inf"
-#include "../../serviceproviders/sapi_applicationmanager/tsrc/group/bld.inf"
+//#include "../../serviceproviders/sapi_applicationmanager/tsrc/group/bld.inf"
 #include "../../serviceproviders/sapi_mediamanagement/tsrc/group/bld.inf"
 #include "../../serviceproviders/sapi_location/tsrc/group/bld.inf"
 #include "../../serviceproviders/sapi_logging/tsrc/group/bld.inf"
-#include "../../serviceproviders/sapi_contacts_vpbk/tsrc/group/bld.inf"
+//#include "../../serviceproviders/sapi_contacts_vpbk/tsrc/group/bld.inf"
 #include "../../serviceproviders/sapi_sysinfo/tsrc/group/bld.inf"
-#include "../../serviceproviders/sapi_calendar/tsrc/group/bld.inf"
+//#include "../../serviceproviders/sapi_calendar/tsrc/group/bld.inf"
 #include "../../serviceproviders/sapi_sensor/tsrc/group/bld.inf"
-#include "../../serviceproviders/sapi_messaging/tsrc/group/bld.inf"
+//#include "../../serviceproviders/sapi_messaging/tsrc/group/bld.inf"
 #include "../../serviceproviders/sapi_serviceregistry/tsrc/group/bld.inf"