--- a/localconnectivityservice/dun/atext/src/DunAtCmdPusher.cpp	Tue May 25 13:38:30 2010 +0300
+++ b/localconnectivityservice/dun/atext/src/DunAtCmdPusher.cpp	Wed Jun 09 10:39:48 2010 +0300
@@ -274,9 +274,15 @@
     FTRACE(FPrint( _L("CDunAtCmdPusher::CheckAndRemoveOkString()") ));
     TInt recvBufferLength = iRecvBuffer.Length();
     TInt okBufferLength = iOkBuffer->Length();
-    if ( recvBufferLength <= okBufferLength )
+    // Skip the removal if removing not possible, if removal results in zero
+    // length (plugin should have used KErrReplyTypeOk) or if string to be
+    // removed is zero.
+    // Note also that if plugin sends a final reply when quiet mode is on, DUN
+    // can't remove the possibly existing result code as it is different from
+    // iOkReply (zero length).
+    if ( recvBufferLength<=okBufferLength || okBufferLength<=0 )
         {
-        FTRACE(FPrint( _L("CDunAtCmdPusher::CheckAndRemoveOkString() (ERROR) complete") ));
+        FTRACE(FPrint( _L("CDunAtCmdPusher::CheckAndRemoveOkString() (skip) complete") ));
         return KErrGeneral;
         }
     TInt lengthWithNoOk = recvBufferLength - okBufferLength;

--- a/localconnectivityservice/dun/utils/src/DunNoteHandler.cpp	Tue May 25 13:38:30 2010 +0300
+++ b/localconnectivityservice/dun/utils/src/DunNoteHandler.cpp	Wed Jun 09 10:39:48 2010 +0300
@@ -19,7 +19,7 @@
 #include <bautils.h>
 #include <featmgr.h>
 #include <aknSDData.h>
-#include <secondarydisplay/dunsecondarydisplayapi.h>
+#include <SecondaryDisplay/dunsecondarydisplayapi.h>
 #include "DunNoteHandler.h"
 #include "DunDebug.h"
 

--- a/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp	Tue May 25 13:38:30 2010 +0300
+++ b/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp	Wed Jun 09 10:39:48 2010 +0300
@@ -34,7 +34,7 @@
 #include <btnotif.h>        	// Notifier UID's
 #include <aknnotewrappers.h> 	//For notifier
 #include <featmgr.h>
-#include <secondarydisplay/obexutilssecondarydisplayapi.h>
+#include <SecondaryDisplay/obexutilssecondarydisplayapi.h>
 
 const TInt KIrMtmUiConnectionTimeout     = 20000000;
 const TInt KIrMtmUiReceiveTimeout        = 0;

--- a/localconnectivityservice/obexreceiveservices/opp/src/oppcontroller.cpp	Tue May 25 13:38:30 2010 +0300
+++ b/localconnectivityservice/obexreceiveservices/opp/src/oppcontroller.cpp	Wed Jun 09 10:39:48 2010 +0300
@@ -593,7 +593,8 @@
             iDrive = imsDrive;            
             }
         }
-    else
+    
+    if ( iDrive == EDriveZ)
         {
         err = rfs.Volume(volumeInfo, mmcDrive);
         if ( !err )

--- a/localconnectivityservice/obexserviceman/utils/src/obexutilsdialog.cpp	Tue May 25 13:38:30 2010 +0300
+++ b/localconnectivityservice/obexserviceman/utils/src/obexutilsdialog.cpp	Wed Jun 09 10:39:48 2010 +0300
@@ -20,7 +20,7 @@
 #include    "obexutilsdialog.h"
 #include    "obexutilsdialogtimer.h"
 #include    "obexutilsuilayer.h"
-#include    <secondarydisplay/obexutilssecondarydisplayapi.h>
+#include    <SecondaryDisplay/obexutilssecondarydisplayapi.h>
 #include    <aknnotewrappers.h>
 #include    <eikprogi.h>
 #include    <Obexutils.rsg>

--- a/localconnectivityservice/obexserviceman/utils/src/obexutilsuilayer.cpp	Tue May 25 13:38:30 2010 +0300
+++ b/localconnectivityservice/obexserviceman/utils/src/obexutilsuilayer.cpp	Wed Jun 09 10:39:48 2010 +0300
@@ -21,7 +21,7 @@
 #include "obexutilslaunchwaiter.h"
 #include "obexutilsdebug.h"
 
-#include <secondarydisplay/obexutilssecondarydisplayapi.h>
+#include <SecondaryDisplay/obexutilssecondarydisplayapi.h>
 #include <Obexutils.rsg>
 #include <aknnotewrappers.h>
 #include <AknGlobalConfirmationQuery.h>