attempt to fix remove from autostart

1 files changed, 1 insertions, 1 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 59b38e3..e9e17f7 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -617,377 +617,377 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
               delete tmp;
             }// no else
             /** c1) */
           }else{ // we checked
             // do something different see what we need to do
             // let's see if we should check the device
             cfg.setGroup("main" );
             bool check = cfg.readBoolEntry("autocheck", true );
             if( check ){ // find the documents
               tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") );
               docsFolder->appendFrom( *tmp );
               delete tmp;
             }
           }
         }
        }
     }
     m_timeStamp = newStamp;
 }
 
 void Launcher::updateTabs()
 {
     MimeType::updateApplications(); // ### reads all applnks twice
 
     delete rootFolder;
     rootFolder = new AppLnkSet( MimeType::appsFolderName() );
 
     loadDocs();
 
     tabs->initializeCategories(rootFolder, docsFolder, storage->fileSystems());
 }
 
 void Launcher::updateDocs()
 {
     loadDocs();
     tabs->updateDocs(docsFolder,storage->fileSystems());
 }
 
 void Launcher::viewSelected(const QString& s)
 {
     setCaption( s + tr(" - Launcher") );
 }
 
 void Launcher::nextView()
 {
     tabs->nextTab();
 }
 
 
 void Launcher::select( const AppLnk *appLnk )
 {
     if ( appLnk->type() == "Folder" ) {
   // Not supported: flat is simpler for the user
     } else {
   if ( appLnk->exec().isNull() ) {
       QMessageBox::information(this,tr("No application"),
     tr("<p>No application is defined for this document."
     "<p>Type is %1.").arg(appLnk->type()));
       return;
   }
   tabs->setBusy(TRUE);
   emit executing( appLnk );
   appLnk->execute();
     }
 }
 
 void Launcher::externalSelected(const AppLnk *appLnk)
 {
     tabs->setBusy(TRUE);
     emit executing( appLnk );
 }
 
 void Launcher::properties( AppLnk *appLnk )
 {
     if ( appLnk->type() == "Folder" ) {
   // Not supported: flat is simpler for the user
     } else {
   in_lnk_props = TRUE;
   got_lnk_change = FALSE;
   LnkProperties prop(appLnk);
   connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
   prop.showMaximized();
   prop.exec();
   in_lnk_props = FALSE;
   if ( got_lnk_change ) {
       updateLink(lnk_change);
   }
     }
 }
 
 void Launcher::updateLink(const QString& link)
 {
     if (link.isNull())
   updateTabs();
     else if (link.isEmpty())
   updateDocs();
     else
   tabs->updateLink(link);
 }
 
 void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "closing(QString)" ){
         QString app;
         stream >> app;
         qWarning("app closed %s", app.latin1()  );
         MRUList::removeTask( app );
     }else if ( msg == "linkChanged(QString)" ) {
         QString link;
         stream >> link;
         if ( in_lnk_props ) {
             got_lnk_change = TRUE;
             lnk_change = link;
         } else {
             updateLink(link);
         }
     } else if ( msg == "busy()" ) {
         emit busy();
     } else if ( msg == "notBusy(QString)" ) {
         QString app;
         stream >> app;
         tabs->setBusy(FALSE);
         emit notBusy(app);
     } else if ( msg == "mkdir(QString)" ) {
         QString dir;
         stream >> dir;
         if ( !dir.isEmpty() )
             mkdir( dir );
     } else if ( msg == "rdiffGenSig(QString,QString)" ) {
         QString baseFile, sigFile;
         stream >> baseFile >> sigFile;
         QRsync::generateSignature( baseFile, sigFile );
     } else if ( msg == "rdiffGenDiff(QString,QString,QString)" ) {
         QString baseFile, sigFile, deltaFile;
         stream >> baseFile >> sigFile >> deltaFile;
         QRsync::generateDiff( baseFile, sigFile, deltaFile );
     } else if ( msg == "rdiffApplyPatch(QString,QString)" ) {
         QString baseFile, deltaFile;
         stream >> baseFile >> deltaFile;
         if ( !QFile::exists( baseFile ) ) {
             QFile f( baseFile );
             f.open( IO_WriteOnly );
             f.close();
         }
         QRsync::applyDiff( baseFile, deltaFile );
         QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" );
         e << baseFile;
     } else if ( msg == "rdiffCleanup()" ) {
         mkdir( "/tmp/rdiff" );
         QDir dir;
         dir.setPath( "/tmp/rdiff" );
         QStringList entries = dir.entryList();
         for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
             dir.remove( *it );
     } else if ( msg == "sendHandshakeInfo()" ) {
         QString home = getenv( "HOME" );
         QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" );
         e << home;
         int locked = (int) Desktop::screenLocked();
         e << locked;
         // register an app for autostart
         // if clear is send the list is cleared.
     } else if ( msg == "autoStart(QString)" ) {
         QString appName;
         stream >> appName;
         Config cfg( "autostart" );
         cfg.setGroup( "AutoStart" );
         if ( appName.compare("clear") == 0){
             cfg.writeEntry("Apps", "");
         }
     } else if ( msg == "autoStart(QString,QString)" ) {
         QString modifier, appName;
         stream >> modifier >> appName;
         Config cfg( "autostart" );
         cfg.setGroup( "AutoStart" );
         if ( modifier.compare("add") == 0 ){
             // only add if appname is entered
             if (!appName.isEmpty()) {
                 cfg.writeEntry("Apps", appName);
             }
         } else if (modifier.compare("remove") == 0 ) {
             // need to change for multiple entries
             // actually remove is right now simular to clear, but in future there
             // should be multiple apps in autostart possible.
             QString checkName;
             checkName = cfg.readEntry("Apps", "");
             if (checkName == appName) {
                 cfg.writeEntry("Apps", "");
             }
         }
         // case the autostart feature should be delayed
-    } else if ( msg == "autoStart(QString, QString, QString)") {
+    } else if ( msg == "autoStart(QString,QString,QString)") {
          QString modifier, appName, delay;
          stream >> modifier >> appName >> delay;
         Config cfg( "autostart" );
         cfg.setGroup( "AutoStart" );
         if ( modifier.compare("add") == 0 ){
             // only add it appname is entered
             if (!appName.isEmpty()) {
                 cfg.writeEntry("Apps", appName);
                 cfg.writeEntry("Delay", delay);
             }
         } else {
         }
     } else if ( msg == "sendCardInfo()" ) {
         QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
         const QList<FileSystem> &fs = storage->fileSystems();
         QListIterator<FileSystem> it ( fs );
         QString s;
         QString homeDir = getenv("HOME");
         QString hardDiskHome;
         for ( ; it.current(); ++it ) {
             if ( (*it)->isRemovable() )
                 s += (*it)->name() + "=" + (*it)->path() + "/Documents "
                      + QString::number( (*it)->availBlocks() * (*it)->blockSize() )
                      + " " + (*it)->options() + ";";
             else if ( (*it)->disk() == "/dev/mtdblock1" ||
                       (*it)->disk() == "/dev/mtdblock/1" )
                 s += (*it)->name() + "=" + homeDir + "/Documents "
                      + QString::number( (*it)->availBlocks() * (*it)->blockSize() )
                      + " " + (*it)->options() + ";";
             else if ( (*it)->name().contains( "Hard Disk") &&
                       homeDir.contains( (*it)->path() ) &&
                       (*it)->path().length() > hardDiskHome.length() )
                 hardDiskHome =
                     (*it)->name() + "=" + homeDir + "/Documents "
                     + QString::number( (*it)->availBlocks() * (*it)->blockSize() )
                     + " " + (*it)->options() + ";";
         }
         if ( !hardDiskHome.isEmpty() )
             s += hardDiskHome;
 
         e << s;
     } else if ( msg == "sendSyncDate(QString)" ) {
         QString app;
         stream >> app;
         Config cfg( "qpe" );
         cfg.setGroup("SyncDate");
         QCopEnvelope e( "QPE/Desktop", "syncDate(QString,QString)" );
         e  << app  << cfg.readEntry( app );
         //qDebug("QPE/System sendSyncDate for %s: response %s", app.latin1(),
         //cfg.readEntry( app ).latin1() );
     } else if ( msg == "setSyncDate(QString,QString)" ) {
         QString app, date;
         stream >> app >> date;
         Config cfg( "qpe" );
         cfg.setGroup("SyncDate");
         cfg.writeEntry( app, date );
         //qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1());
     } else if ( msg == "startSync(QString)" ) {
         QString what;
         stream >> what;
         delete syncDialog; syncDialog = 0;
         syncDialog = new SyncDialog( this, "syncProgress", FALSE,
                                      WStyle_Tool | WStyle_Customize |
                                      Qt::WStyle_StaysOnTop );
         syncDialog->showMaximized();
         syncDialog->whatLabel->setText( "<b>" + what + "</b>" );
         connect( syncDialog->buttonCancel, SIGNAL( clicked() ),
                  SLOT( cancelSync() ) );
     } else if ( msg == "stopSync()") {
         delete syncDialog; syncDialog = 0;
     } else if ( msg == "getAllDocLinks()" ) {
         loadDocs();
 
         QString contents;
 
         for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) {
             DocLnk *doc = it.current();
             QFileInfo fi( doc->file() );
             if ( !fi.exists() )
                 continue;
 
             bool fake = !doc->linkFileKnown();
             if ( !fake ) {
                 QFile f( doc->linkFile() );
                 if ( f.open( IO_ReadOnly ) ) {
                     QTextStream ts( &f );
                     ts.setEncoding( QTextStream::UnicodeUTF8 );
                     contents += ts.read();
                     f.close();
                 } else
                     fake = TRUE;
             }
             if (fake) {
                 contents += "[Desktop Entry]\n";
                 contents += "Categories = " + Qtopia::Record::idsToString( doc->categories() ) + "\n";
                 contents += "File = "+doc->file()+"\n";
                 contents += "Name = "+doc->name()+"\n";
                 contents += "Type = "+doc->type()+"\n";
             }
             contents += QString("Size = %1\n").arg( fi.size() );
         }
 
         //qDebug( "sending length %d", contents.length() );
         QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" );
         e << contents;
 
         qDebug( "================ \n\n%s\n\n===============",
                 contents.latin1() );
 
         delete docsFolder;
         docsFolder = 0;
     }
 }
 
 void Launcher::cancelSync()
 {
     QCopEnvelope e( "QPE/Desktop", "cancelSync()" );
 }
 
 void Launcher::storageChanged()
 {
     if ( in_lnk_props ) {
   got_lnk_change = TRUE;
   lnk_change = "";
     } else {
   updateDocs();
     }
 }
 
 
 bool Launcher::mkdir(const QString &localPath)
 {
     QDir fullDir(localPath);
     if (fullDir.exists())
   return true;
 
     // at this point the directory doesn't exist
     // go through the directory tree and start creating the direcotories
     // that don't exist; if we can't create the directories, return false
 
     QString dirSeps = "/";
     int dirIndex = localPath.find(dirSeps);
     QString checkedPath;
 
     // didn't find any seps; weird, use the cur dir instead
     if (dirIndex == -1) {
   //qDebug("No seperators found in path %s", localPath.latin1());
   checkedPath = QDir::currentDirPath();
     }
 
     while (checkedPath != localPath) {
   // no more seperators found, use the local path
   if (dirIndex == -1)
       checkedPath = localPath;
   else {
       // the next directory to check
       checkedPath = localPath.left(dirIndex) + "/";
       // advance the iterator; the next dir seperator
       dirIndex = localPath.find(dirSeps, dirIndex+1);
   }
 
   QDir checkDir(checkedPath);
   if (!checkDir.exists()) {
       //qDebug("mkdir making dir %s", checkedPath.latin1());
 
       if (!checkDir.mkdir(checkedPath)) {
     qDebug("Unable to make directory %s", checkedPath.latin1());
     return FALSE;
       }
   }
 
     }
     return TRUE;
 }
 
 void Launcher::preloadApps()
 {
     Config cfg("Launcher");
     cfg.setGroup("Preload");
     QStringList apps = cfg.readListEntry("Apps",',');
     for (QStringList::ConstIterator it=apps.begin(); it!=apps.end(); ++it) {
   QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
     }
 }