# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1269351302 0
# Node ID 673af61f0c84016497f904d599b0cc2a25c5ba61
# Parent  8a14eb1e2ccd67554113ee9f34c20aac2694a988# Parent  b77288873c88aeb75a4642d1149e107680382197
Catch up merge.

diff -r 8a14eb1e2ccd -r 673af61f0c84 graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfscreen_displaychannel.cpp
--- a/graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfscreen_displaychannel.cpp	Sun Mar 14 13:15:18 2010 +0000
+++ b/graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfscreen_displaychannel.cpp	Tue Mar 23 13:35:02 2010 +0000
@@ -115,11 +115,7 @@
 void COWFScreenDisplayInfo::ConstructL()
     {
     User::LeaveIfError(iDispChan.Open(iScreenNumber));
-#ifdef __WINS__
     iDefaultRotation = RDisplayChannel::ERotationNormal;
-#else
-    iDefaultRotation = RDisplayChannel::ERotation270CW;
-#endif
     
     switch (iDispChan.CurrentRotation())
         {
diff -r 8a14eb1e2ccd -r 673af61f0c84 windowing/windowserver/group/wserv.iby
--- a/windowing/windowserver/group/wserv.iby	Sun Mar 14 13:15:18 2010 +0000
+++ b/windowing/windowserver/group/wserv.iby	Tue Mar 23 13:35:02 2010 +0000
@@ -23,8 +23,10 @@
 file=ABI_DIR\BUILD_DIR\wserv_nga.exe 	System\Libs\EwSrv.exe
 file=ABI_DIR\BUILD_DIR\ws32_nga.dll 	System\Libs\Ws32.dll
 file=ABI_DIR\BUILD_DIR\remotegc_nga.dll	System\Libs\remotegc.dll 
-file=ABI_DIR\BUILD_DIR\wsgraphicdrawer_nga.dll	System\Libs\WsGraphicDrawer.dll 
+file=ABI_DIR\BUILD_DIR\wsgraphicdrawer_nga.dll	System\Libs\WsGraphicDrawer.dll
+#ifndef SYMBIAN_GRAPHICS_USE_OPENWF 
 #include <gce.iby>
+#endif
 #include <wserv_std_plugins.iby>
 //wserv calls eglReleaseThread() on exit
 #include <egl.iby>