--- a/windowing/windowserver/nga/SERVER/openwfc/CLIENT.CPP	Thu Aug 19 11:11:18 2010 +0300
+++ b/windowing/windowserver/nga/SERVER/openwfc/CLIENT.CPP	Tue Aug 31 16:31:06 2010 +0300
@@ -1286,6 +1286,9 @@
 		case EWsClOpCreateDrawableSource:
 			CreateDrawableSourceL(*pData.CreateDrawableSource);
 			break;
+		case EWsClOpIndicateAppOrientation:
+			IndicateAppOrientation(*pData.Orientation);
+			break;
 		default:
 			PPanic(EWservPanicOpcode);
 			break;
@@ -1834,28 +1837,23 @@
 
 void CWsClient::CompleteMessage(const RMessage2& aMessage,TInt aReason)
 	{
-	WS_ASSERT_DEBUG(!aMessage.IsNull(),EWsPanicCompleteNullMessage);
-	// This defensive check should not be necessary as aMessage should never
-	// be null, but in rare situations it is and WServ would die without this check.
-	if (!aMessage.IsNull())
+	WS_ASSERT_DEBUG(!aMessage.IsNull(),EWsPanicPanicFlagError);
+	if (iInternalFlags&EPanicClientAsSoonAsPossible)
 		{
-		if (iInternalFlags&EPanicClientAsSoonAsPossible)
-			{
-			aMessage.Panic(KWSERVSessionPanicCategory,iPanicReason);
-			iInternalFlags&=~EPanicClientAsSoonAsPossible;
-			}
+		aMessage.Panic(KWSERVSessionPanicCategory,iPanicReason);
+		iInternalFlags&=~EPanicClientAsSoonAsPossible;
+		}
+	else
+		{
+		if(!iResponseHandle)
+			aMessage.Complete(aReason);
 		else
 			{
-			if(!iResponseHandle)
-				aMessage.Complete(aReason);
-			else
-				{
-				aMessage.Complete(*iResponseHandle);
-				iResponseHandle=NULL;
-				}
+			aMessage.Complete(*iResponseHandle);
+			iResponseHandle=NULL;
 			}
 		}
-    }
+	}
 
 void CWsClient::ServiceError(const RMessage2& /*aMessage*/,TInt aError)
 	{
@@ -2143,6 +2141,17 @@
 	drawableSource->ConstructL(aDrawableSourceData);
 	CleanupStack::Pop();
 	}
+	
+void CWsClient::IndicateAppOrientation(TRenderOrientation aOrientation)
+	{
+	iIndicatedAppOrientation = aOrientation;
+	CWsTop::CheckRenderOrientation();
+	}
+
+TInt CWsClient::GetIndicatedAppOrientation()
+	{
+	return iIndicatedAppOrientation;
+	}
 
 //
 // class CWsCliObj