--- a/uifw/EikStd/srvuisrc/EIKSRVUI.CPP	Mon Jun 21 22:36:19 2010 +0100
+++ b/uifw/EikStd/srvuisrc/EIKSRVUI.CPP	Thu Jul 22 16:35:40 2010 +0100
@@ -628,12 +628,13 @@
 
 EXPORT_C void CEikServAppUiBase::HandleThreadExitL(RThread& aThread)
     {
+    _LIT(KAppArcServerThread, "AppArcServerThread");
     if (aThread.Name() == ASCliDefinitions::ServerAndThreadName()) // alarm server died
         {
         aThread.Close(); // need to Close() before restarting with same name
         iServerToRestart |= EAlwlSvr; // restarted under active object
         }
-    else if (aThread.Name()==NameApaServServerThread()) // AppArc server died
+    else if (aThread.Name() == KAppArcServerThread) // AppArc server died
         {
         aThread.Close();
         iServerToRestart|=EApaSvr;
@@ -1069,7 +1070,11 @@
     _LIT(KTimeout, "timeout");
     _LIT(KTitle,   "title");
 
-    CHbDeviceDialogSymbian* dlg = CHbDeviceDialogSymbian::NewL();
+    //@TODO replace the hardcoded parameter after enum EASyncServerStartup
+    // is defined(after MCL wk26).
+    //CHbDeviceDialogSymbian* dlg = CHbDeviceDialogSymbian::NewL(
+    //                    CHbDeviceDialogSymbian::EASyncServerStartup);
+    CHbDeviceDialogSymbian* dlg = CHbDeviceDialogSymbian::NewL(2);
     CleanupStack::PushL(dlg);
 
     TInt  timeout = 0;