--- a/tsrc/propertystub/src/e32property.cpp	Tue Aug 31 15:12:07 2010 +0300
+++ b/tsrc/propertystub/src/e32property.cpp	Wed Sep 01 12:31:01 2010 +0100
@@ -16,18 +16,12 @@
 */
 
 #include "e32property.h"
-#include "mussessionproperties.h"
-#include "mussesseioninformationapi.h"
 #include <e32cmn.h>
 
 static RArray<TUint> iIntProperty;
 static TInt iErrorCode = KErrNone;
 static RProperty::TPropertyCalledFunctions iCalledFunction = RProperty::ENone;
-// Large enough to store maximum length descriptor for RProperty
-static TBuf<RProperty::KMaxPropertySize> iString = KNullDesC();
-static TBuf<RProperty::KMaxPropertySize> iVideoCodecList = KNullDesC();
-static TBuf<RProperty::KMaxPropertySize> iSessionRecipient = KNullDesC();
-static TBuf<RProperty::KMaxPropertySize> iEngineName = KNullDesC();
+static TName iString = KNullDesC();
 static TInt iValue = KErrNotFound;
 
 
@@ -84,7 +78,6 @@
     return error;
     }
 
-
 TInt RProperty::Get( TUid /*aCategory*/, TUint /*aKey*/, TDes8& aValue)
     {
     // This is not widely used in Mush , so who cares in stub.
@@ -92,26 +85,10 @@
     return iErrorCode;
     }
 
-
-TInt RProperty::Get( TUid /*aCategory*/, TUint aKey, TDes16& aValue )
+TInt RProperty::Get( TUid /*aCategory*/, TUint /*aKey*/, TDes16& aValue )
     {
-    if ( aKey == NMusSessionInformationApi::KMUSCallProvider )
-         {
-         aValue = iEngineName;
-         }
-    else if ( aKey == NMusSessionApi::KVideoCodecs )
-        {
-        aValue = iVideoCodecList;
-        }
-    else if ( aKey == NMusSessionApi::KRemoteSipAddress )
-        {
-        aValue = iSessionRecipient;
-        }
-    else
-        {
-        aValue = iString;
-        }
-    
+    // This is not widely used in Mush , so who cares in stub.
+    aValue = iString;
     return iErrorCode;
     }
 
@@ -141,27 +118,10 @@
     return iErrorCode;
     }
 
-
-TInt RProperty::Set( TUid /*aCategory*/, TUint aKey, const TDesC& aValue )
+TInt RProperty::Set( TUid /*aCategory*/, TUint /*aKey*/, const TDesC& aValue )
     {
-
-    if ( aKey == NMusSessionInformationApi::KMUSCallProvider )
-        {
-        iEngineName = aValue;
-        }
-    
-    else if ( aKey == NMusSessionApi::KVideoCodecs )
-        {
-        iVideoCodecList = aValue;
-        }
-    else if ( aKey == NMusSessionApi::KRemoteSipAddress )
-        {
-        iSessionRecipient = aValue;
-        }
-    else
-        {
-        iString = aValue;
-        }
+    // This is not widely used in Mush , so who cares in stub.
+    iString = aValue;
     return iErrorCode;
     }
 
@@ -233,7 +193,7 @@
     iErrorCode = KErrNone;
     iCalledFunction = RProperty::ENone;
     iString = KNullDesC();
-    iEngineName = KNullDesC();
     iValue = KErrNotFound;
     }
 
+