# HG changeset patch
# User hgs
# Date 1272055287 -10800
# Node ID 7d6b2478da42969bea941bb6112bb2b3c243a453
# Parent  d74a43a4aa5946c7191da2f7890eabc9ec5364b8
201005_2

diff -r d74a43a4aa59 -r 7d6b2478da42 localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmui.cpp
--- a/localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmui.cpp	Fri Apr 23 23:27:23 2010 +0300
+++ b/localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmui.cpp	Fri Apr 23 23:41:27 2010 +0300
@@ -25,7 +25,11 @@
 #ifdef NO101APPDEPFIXES
 #include <MuiuMsvProgressReporterOperation.h>
 #endif  //NO101APPDEPFIXES
+
+#ifdef NO101APPDEPFIXES_NEW 
 #include <app/btcmtm.h>
+#endif //NO101APPDEPFIXES_NEW
+
 #include <mtmuidef.hrh>
 #include <mtclreg.h>
 #include <obexutilsuilayer.h>
@@ -490,8 +494,13 @@
 // ---------------------------------------------------------
 //
 TInt CBtMtmUi::DisplayProgressSummaryL( const TDesC8& aProgress ) const
-	{
-	FLOG( _L( "[CBtMtmUi] CBtMtmUi:DisplayProgressSummaryL\t" ) );
+    {
+    #ifndef NO101APPDEPFIXES_NEW
+    (void) aProgress;
+    #endif //NO101APPDEPFIXES_NEW
+
+    #ifdef NO101APPDEPFIXES_NEW
+    FLOG( _L( "[CBtMtmUi] CBtMtmUi:DisplayProgressSummaryL\t" ) );
     TInt resourceId;
     if( ( !aProgress.Length() ) || ( aProgress.Size() == sizeof( TMsvLocalOperationProgress ) ) )
         {
@@ -561,6 +570,7 @@
             return KErrCancel;
             }
         }
+  #endif //NO101APPDEPFIXES_NEW
 	return KErrNone;
 	}
 
@@ -577,8 +587,19 @@
                            TInt& aCurrentEntrySize, 
                            TInt& aCurrentBytesTrans ) const
 	{
-    TInt resourceId;
-	FLOG( _L( "[CBtMtmUi] CBtMtmUi: GetProgress\t" ) );
+	#ifndef NO101APPDEPFIXES_NEW
+	(void) aProgress;
+	(void) aReturnString;
+	(void) aTotalEntryCount;
+	(void) aEntriesDone;
+	(void) aCurrentEntrySize;
+	(void) aCurrentBytesTrans;	
+	#endif //NO101APPDEPFIXES_NEW
+	
+   #ifdef  NO101APPDEPFIXES_NEW
+    TInt resourceId;    
+
+	FLOG( _L( "[CBtMtmUi] CBtMtmUi: GetProgress\t" ) );	
 	TPckgBuf<TObexMtmProgress> paramPack;
 	paramPack.Copy( aProgress );
 	TObexMtmProgress& progress = paramPack();
@@ -631,6 +652,7 @@
             }
 		}
 	FLOG( _L( "[CBtMtmUi] CBtMtmUi: GetProgress Done\t" ) );
+	#endif //NO101APPDEPFIXES_NEW
 	return KErrNone;
 	}
 
diff -r d74a43a4aa59 -r 7d6b2478da42 localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp
--- a/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp	Fri Apr 23 23:27:23 2010 +0300
+++ b/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp	Fri Apr 23 23:41:27 2010 +0300
@@ -22,7 +22,10 @@
 #include "irmtmui.h"
 #include "debug.h"
 
+#ifdef NO101APPDEPFIXES_NEW
 #include <app/ircmtm.h>
+#endif //NO101APPDEPFIXES_NEW
+
 #include <mtmuidef.hrh>
 #include <mtclreg.h>
 #include <obexutilsuilayer.h>
@@ -443,6 +446,11 @@
 //
 TInt CIrMtmUi::DisplayProgressSummaryL( const TDesC8& aProgress ) const
     {
+    #ifndef NO101APPDEPFIXES_NEW
+    (void) aProgress;
+    #endif //NO101APPDEPFIXES_NEW
+    
+    #ifdef NO101APPDEPFIXES_NEW
     FLOG( _L( "[IRU] CIrMtmUi: DisplayProgressSummaryL\t" ) );
     TInt resourceId;
     if( ( !aProgress.Length() ) || 
@@ -511,6 +519,7 @@
             }
         }
     FLOG( _L( "[IRU] CIrMtmUi: DisplayProgressSummaryL Done\t" ) );
+    #endif //NO101APPDEPFIXES_NEW
     return KErrNone;
     }
 
@@ -526,6 +535,16 @@
                            TInt& aCurrentEntrySize, 
                            TInt& aCurrentBytesTrans ) const
     {
+    #ifndef NO101APPDEPFIXES_NEW
+    (void) aProgress;
+    (void) aReturnString;
+    (void) aTotalEntryCount;
+    (void) aEntriesDone;
+    (void) aCurrentEntrySize;
+    (void) aCurrentBytesTrans;	
+    #endif //NO101APPDEPFIXES_NEW
+    
+    #ifdef NO101APPDEPFIXES_NEW
     FLOG( _L( "[CIrMtmUi] CIrMtmUi: GetProgress\t" ) );
     TPckgBuf<TObexMtmProgress> paramPack;
     paramPack.Copy( aProgress );
@@ -572,6 +591,7 @@
             }
         }
     FLOG( _L( "[CBtMtmUi] CBtMtmUi: GetProgress Done\t" ) );
+    #endif //NO101APPDEPFIXES_NEW
     return KErrNone;
     }
 
diff -r d74a43a4aa59 -r 7d6b2478da42 localconnectivityservice/obexserviceman/utils/src/vMessageHandler.cpp
--- a/localconnectivityservice/obexserviceman/utils/src/vMessageHandler.cpp	Fri Apr 23 23:27:23 2010 +0300
+++ b/localconnectivityservice/obexserviceman/utils/src/vMessageHandler.cpp	Fri Apr 23 23:41:27 2010 +0300
@@ -23,16 +23,20 @@
 #include "etelmm.h"
 #include <BTSapDomainPSKeys.h>
 #include <app/smut.h> // KUidMsgTypeSMS
+#ifdef NO101APPDEPFIXES_NEW
 #include <app/smuthdr.h>
+#endif //NO101APPDEPFIXES_NEW
+
 #include <gsmupdu.h>
 #include <txtrich.h>
 #include <msvuids.h>
 
 #include <app/csmsaccount.h>
 
+#ifdef NO101APPDEPFIXES_NEW
 // SMUT Unbranch
 #include <app/csmsgetdetdescinterface.h>
-
+#endif //NO101APPDEPFIXES_NEW
 
 // ================= MEMBER FUNCTIONS =======================
 TBool CSapVMessageParser::HandleMessageL(CObexBufObject*  aReceivedObject, const TUid aMtmID,
@@ -429,8 +433,12 @@
 //
 void CSapVMessageParser::SaveSmsToInboxL(CMsvSession* aMsvSession, CRichText* aMessage)
 {
-    FLOG( _L( " CSapVMessageParser: SaveSmsToInboxL\t" ) );
-
+    #ifndef NO101APPDEPFIXES_NEW
+    (void) aMsvSession; 
+    (void) aMessage; 
+    #endif //NO101APPDEPFIXES_NEW
+    #ifdef NO101APPDEPFIXES_NEW
+    FLOG( _L( " CSapVMessageParser: SaveSmsToInboxL\t" ) ); 
     CSmsHeader* header=CSmsHeader::NewL(CSmsPDU::ESmsDeliver, *aMessage );
     CleanupStack::PushL(header); // 1st push
     header->SetFromAddressL(Address());
@@ -505,6 +513,7 @@
     CleanupStack::PopAndDestroy(header);
 
     FLOG( _L( " CSapVMessageParser: SaveSmsToInboxL: Done\t" ) );
+    #endif  //NO101APPDEPFIXES_NEW
 }
 
 // ---------------------------------------------------------
@@ -514,6 +523,12 @@
 //
 void CSapVMessageParser::SaveSmsToSentL(CMsvSession* aMsvSession, CRichText* aMessage)
 {
+    #ifndef NO101APPDEPFIXES_NEW
+    (void) aMsvSession; 
+    (void) aMessage; 
+    #endif //NO101APPDEPFIXES_NEW
+    
+    #ifdef NO101APPDEPFIXES_NEW
     FLOG( _L( " CSapVMessageParser: SaveSmsToSentL\t" ) );
 
     CSmsHeader* header = CSmsHeader::NewL( CSmsPDU::ESmsSubmit, *aMessage );
@@ -607,6 +622,7 @@
     CleanupStack::PopAndDestroy(header);
 
     FLOG( _L( " CSapVMessageParser: SaveSmsToSentL: Done\t" ) );
+    #endif  //NO101APPDEPFIXES_NEW
 }
 
 //  End of File