--- a/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp	Tue Feb 02 00:45:58 2010 +0200
+++ b/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp	Fri Mar 19 09:42:38 2010 +0200
@@ -22,12 +22,14 @@
 #include "irmtmui.h"
 #include "debug.h"
 
-#include <MuiuMsvProgressReporterOperation.h>
-#include <ircmtm.h>
+#ifdef NO101APPDEPFIXES_NEW
+#include <app/ircmtm.h>
+#endif //NO101APPDEPFIXES_NEW
+
 #include <mtmuidef.hrh>
 #include <mtclreg.h>
 #include <obexutilsuilayer.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
 #include <msvuids.h>
 #include <msvids.h>
 #include <obexconstants.h>
@@ -36,9 +38,6 @@
 #include <featmgr.h>
 #include <SecondaryDisplay/obexutilssecondarydisplayapi.h>
 
-const TInt KIrMtmUiConnectionTimeout     = 20000000;
-const TInt KIrMtmUiReceiveTimeout        = 0;
-
 // ================= MEMBER FUNCTIONS =======================
 
 // C++ default constructor can NOT contain any code, that
@@ -216,6 +215,14 @@
         {
         case KUidMsvMessageEntryValue:
             {
+            return LaunchEditorApplicationL( aStatus, iBaseMtm.Entry().Session() );
+            /* Infrared is not supported anymore. Implementation for sending over Infrared is left for reference:
+            ( add #include <MuiuMsvProgressReporterOperation.h> to the included files )
+            ( add constants:
+                const TInt KIrMtmUiConnectionTimeout     = 20000000;
+                const TInt KIrMtmUiReceiveTimeout        = 0; )
+            code starts here:
+
             if( iBaseMtm.Entry().Entry().Parent() != KMsvDraftEntryId &&
                iBaseMtm.Entry().Entry().Parent() != KMsvGlobalOutBoxIndexEntryId )
                 {
@@ -304,6 +311,9 @@
                 // ownership of reporter transfered to caller
                 return reporter; 
                 }
+
+                End of reference implementation for sending over Infrared:
+                */
             }
         case KUidMsvServiceEntryValue:
         case KUidMsvAttachmentEntryValue:
@@ -436,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() ) || 
@@ -504,6 +519,7 @@
             }
         }
     FLOG( _L( "[IRU] CIrMtmUi: DisplayProgressSummaryL Done\t" ) );
+    #endif //NO101APPDEPFIXES_NEW
     return KErrNone;
     }
 
@@ -519,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 );
@@ -565,6 +591,7 @@
             }
         }
     FLOG( _L( "[CBtMtmUi] CBtMtmUi: GetProgress Done\t" ) );
+    #endif //NO101APPDEPFIXES_NEW
     return KErrNone;
     }