diff -r 57c618273d5c -r bbf46f59e123 graphicscomposition/openwfcompositionengine/group/openwfc.mmp
--- a/graphicscomposition/openwfcompositionengine/group/openwfc.mmp	Thu Aug 19 11:11:18 2010 +0300
+++ b/graphicscomposition/openwfcompositionengine/group/openwfc.mmp	Tue Aug 31 16:31:06 2010 +0300
@@ -1,14 +1,23 @@
-// 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 "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-2010 Nokia Corporation and/or its subsidiary(-ies).
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and/or associated documentation files (the
+// "Materials"), to deal in the Materials without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Materials, and to
+// permit persons to whom the Materials are furnished to do so, subject to
+// the following conditions:
 //
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Materials.
 //
-// Contributors:
+// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 //
 // Description:
 // libWFC.dll OpenWFC Sample Implementation
@@ -20,7 +29,7 @@
 //macros to enable filtering debug log output.
 //DEBUG_LOG must also be defined to enable logging 
 //(automatic if _DEBUG is defined, and DEBUG_DONOT_LOG is not defined)
-MACRO DEBUG_DONOT_LOG
+//MACRO DEBUG_DONOT_LOG
 //MACRO DEBUG_LOG_FUNCTION=WFC_Element_
 //MACRO DEBUG_LOG_FILE=owfnotifications.c
 
@@ -56,6 +65,7 @@
 LIBRARY			hal.lib
 LIBRARY			wfcinterop.lib
 LIBRARY			surfacemanager.lib
+LIBRARY			openwfc_ri_display.lib
 
 SOURCEPATH	../composition/src
 SOURCE			wfcapi.c 
@@ -79,7 +89,7 @@
 
 SOURCEPATH	../adaptation/src/Platform/OS/symbian
 SOURCE			owfconsole.cpp
-SOURCE			owfmessagequeue.c
+SOURCE			owfmessagequeue.cpp
 SOURCE			owfmutex.c
 SOURCE			owfsemaphore.c
 SOURCE			owfthread.c
@@ -87,9 +97,9 @@
 
 SOURCEPATH ../adaptation/src/Platform/Graphics/symbian
 SOURCE			owfdisplaycontext.cpp
-SOURCE 			owfscreen_displaychannel.cpp
 SOURCE 			owfnativestreamstub.cpp
-SOURCE 			owfnotifications.cpp
+SOURCE 			owfnotifications.cpp 
+SOURCE                  owfscreen.cpp