1 files changed, 10 insertions, 10 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 1ec477c..5aba8dd 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -491,79 +491,79 @@ void Desktop::executeOrModify(const QString& appLnkFile)
       if ( hasVisibleWindow(app) )
     QCopChannel::send("QPE/Application/" + app, "nextView()");
       else
     QCopChannel::send("QPE/Application/" + app, "raise()");
   } else {
       lnk.execute();
   }
     }
 }
 
 void Desktop::raiseDatebook()
 {
     Config cfg("qpe"); //F9 'Activity'
     cfg.setGroup("AppsKey");
     QString tempItem;
     tempItem = cfg.readEntry("LeftEnd","Calender");
-    if(tempItem == "Calender" || tempItem.isEmpty())  executeOrModify("Applications/datebook.desktop");
-    else {
+    if ( tempItem == "Calender" || tempItem.isEmpty() ) {
+        tempItem = "datebook";
+    }
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
-}
 
 void Desktop::raiseContacts()
 {
     Config cfg("qpe"); //F10, 'Contacts'
     cfg.setGroup("AppsKey");
     QString tempItem;
     tempItem = cfg.readEntry("Left2nd","Address Book");
-    if(tempItem == "Address Book" || tempItem.isEmpty())  executeOrModify("Applications/addressbook.desktop");
-    else {
+    if ( tempItem == "Address Book" || tempItem.isEmpty() )  {
+        tempItem = "addressbook";
+    }
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
-}
 
 void Desktop::raiseMenu()
 {
-    Config cfg("qpe"); //F11, 'Menu'
+    Config cfg( "qpe" ); //F11, 'Menu
     cfg.setGroup("AppsKey");
     QString tempItem;
     tempItem = cfg.readEntry("Right2nd","Popup Menu");
     if(tempItem == "Popup Menu" || tempItem.isEmpty()) {
     Global::terminateBuiltin("calibrate");
     tb->startMenu()->launch();
     } else {
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
 }
 
 void Desktop::raiseEmail()
 {
     Config cfg("qpe"); //F13, 'Mail'
     cfg.setGroup("AppsKey");
     QString tempItem;
     tempItem = cfg.readEntry("RightEnd","Mail");
-    if(tempItem == "Mail" || tempItem == "qtmail" || tempItem.isEmpty())  executeOrModify("Applications/qtmail.desktop");
-    else {
+    if ( tempItem == "Mail" || tempItem == "qtmail" || tempItem.isEmpty() ) {
+        tempItem = "mail";
+    }
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
-}
 
 // autoStarts apps on resume and start
 void Desktop::execAutoStart() {
     QString appName;
     int delay;
     QDateTime now = QDateTime::currentDateTime();
     Config cfg( "autostart" );
     cfg.setGroup( "AutoStart" );
     appName = cfg.readEntry( "Apps", "" );
     delay = ( cfg.readEntry( "Delay", "0" ) ).toInt();
     // If the time between suspend and resume was longer then the
     // value saved as delay, start the app
     if ( suspendTime.secsTo( now ) >= ( delay * 60 )  && !appName.isEmpty() ) {
         QCopEnvelope e( "QPE/System", "execute(QString)" );
         e << QString( appName );
     }