1 files changed, 332 insertions, 332 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 0573330..8fe41f7 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -80,5 +80,5 @@ void CategoryTabWidget::prevTab()
     if ( categoryBar ) {
-        int n = categoryBar->count();
-        int tab = categoryBar->currentTab();
-        if ( tab >= 0 )
+  int n = categoryBar->count();
+  int tab = categoryBar->currentTab();
+  if ( tab >= 0 )
             categoryBar->setCurrentTab( (tab - 1 + n)%n );
@@ -90,5 +90,5 @@ void CategoryTabWidget::nextTab()
     if ( categoryBar ) {
-        int n = categoryBar->count();
+  int n = categoryBar->count();
         int tab = categoryBar->currentTab();
-        categoryBar->setCurrentTab( (tab + 1)%n );
+  categoryBar->setCurrentTab( (tab + 1)%n );
     }
@@ -101,21 +101,21 @@ void CategoryTabWidget::addItem( const QString& linkfile )
     if ( !app->isValid() ) {
-        delete app;
-        return;
+  delete app;
+  return;
     }
     if ( !app->file().isEmpty() ) {
-        // A document
-        delete app;
-        app = new DocLnk(linkfile);
-        ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
-        return;
+  // A document
+  delete app;
+  app = new DocLnk(linkfile);
+  ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
+  return;
     }
     for ( QStringList::Iterator it=ids.begin(); it!=ids.end(); ++it) {
-        if ( !(*it).isEmpty() ) {
-            QRegExp tf(*it,FALSE,TRUE);
-            if ( tf.match(app->type()) >= 0 ) {
-                ((LauncherView*)stack->widget(i))->addItem(app);
-                return;
-            }
-            i++;
-        }
+  if ( !(*it).isEmpty() ) {
+      QRegExp tf(*it,FALSE,TRUE);
+      if ( tf.match(app->type()) >= 0 ) {
+    ((LauncherView*)stack->widget(i))->addItem(app);
+    return;
+      }
+      i++;
+  }
     }
@@ -124,3 +124,3 @@ void CategoryTabWidget::addItem( const QString& linkfile )
 void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
-        AppLnkSet* docFolder, const QList<FileSystem> &fs)
+  AppLnkSet* docFolder, const QList<FileSystem> &fs)
 {
@@ -141,5 +141,5 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
     for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
-        if ( !(*it).isEmpty() ) {
-            newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
-        }
+  if ( !(*it).isEmpty() ) {
+      newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
+  }
     }
@@ -148,14 +148,14 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
     while ( (l=it.current()) ) {
-        if ( l->type() == "Separator" ) {
-            rootFolder->remove(l);
-            delete l;
-        } else {
-            int i=0;
-            for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
-                if ( *it == l->type() )
-                    ((LauncherView*)stack->widget(i))->addItem(l,FALSE);
-                i++;
-            }
-        }
-        ++it;
+  if ( l->type() == "Separator" ) {
+      rootFolder->remove(l);
+      delete l;
+  } else {
+      int i=0;
+      for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
+    if ( *it == l->type() )
+        ((LauncherView*)stack->widget(i))->addItem(l,FALSE);
+    i++;
+      }
+  }
+  ++it;
     }
@@ -163,3 +163,3 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
     for (int i=0; i<tabs; i++)
-        ((LauncherView*)stack->widget(i))->sort();
+  ((LauncherView*)stack->widget(i))->sort();
 
@@ -192,5 +192,5 @@ LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm,
     connect( view, SIGNAL(clicked(const AppLnk*)),
-            this, SIGNAL(clicked(const AppLnk*)));
+      this, SIGNAL(clicked(const AppLnk*)));
     connect( view, SIGNAL(rightPressed(AppLnk*)),
-            this, SIGNAL(rightPressed(AppLnk*)));
+      this, SIGNAL(rightPressed(AppLnk*)));
     ids.append(id);
@@ -206,4 +206,4 @@ void CategoryTabWidget::updateLink(const QString& linkfile)
     while ((view = (LauncherView*)stack->widget(i++))) {
-        if ( view->removeLink(linkfile) )
-            break;
+  if ( view->removeLink(linkfile) )
+      break;
     }
@@ -226,6 +226,6 @@ void CategoryTabWidget::setBusy(bool on)
     if ( on )
-        ((LauncherView*)stack->visibleWidget())->setBusy(TRUE);
+  ((LauncherView*)stack->visibleWidget())->setBusy(TRUE);
     else
-        for (int i=0; i<tabs; i++)
-            ((LauncherView*)stack->widget(i))->setBusy(FALSE);
+  for (int i=0; i<tabs; i++)
+      ((LauncherView*)stack->widget(i))->setBusy(FALSE);
 }
@@ -247,3 +247,3 @@ void CategoryTabBar::layoutTabs()
     if ( !count() )
-        return;
+  return;
 
@@ -261,52 +261,52 @@ void CategoryTabBar::layoutTabs()
     for ( int i = 0; i < count(); i++ ) {
-        t = tab(i);
-        // if (( i < (middleTab - 1) ) || ( i > (middleTab + 1) )) {
-        if ( i != middleTab ) {
-            // required += hiddenTabWidth + hframe - overlap;
-            available -= hiddenTabWidth + hframe - overlap;
-            if ( t->iconSet() != 0 )
-                available -= t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-        } else {
-            required += fm.width( t->text() ) + hframe - overlap;
-            if ( t->iconSet() != 0 )
-                required += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-        }
+  t = tab(i);
+  // if (( i < (middleTab - 1) ) || ( i > (middleTab + 1) )) {
+  if ( i != middleTab ) {
+      // required += hiddenTabWidth + hframe - overlap;
+      available -= hiddenTabWidth + hframe - overlap;
+      if ( t->iconSet() != 0 )
+    available -= t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
+  } else {
+      required += fm.width( t->text() ) + hframe - overlap;
+      if ( t->iconSet() != 0 )
+    required += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
+  }
     }
     for ( int i = 0; i < count(); i++ ) {
-        t = tab(i);
-        // if (( i < (middleTab - 1) ) || ( i > (middleTab + 1) )) {
-        if ( i != middleTab ) {
-            int w = hiddenTabWidth;
-            int ih = 0;
-            if ( t->iconSet() != 0 ) {
-                w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-                ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
-            }
-            int h = QMAX( fm.height(), ih );
-            h = QMAX( h, QApplication::globalStrut().height() );
-
-            h += vframe;
-            w += hframe;
-
-            t->setRect( QRect(x, 0, w, h) );
-            x += t->rect().width() - overlap;
-            r = r.unite( t->rect() );
-        } else {
-            int w = fm.width( t->text() );
-            int ih = 0;
-            if ( t->iconSet() != 0 ) {
-                w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-                ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
-            }
-            int h = QMAX( fm.height(), ih );
-            h = QMAX( h, QApplication::globalStrut().height() );
-
-            h += vframe;
-            w += hframe;
-
-            // t->setRect( QRect(x, 0, w * available/required, h) );
-            t->setRect( QRect(x, 0, available, h) );
-            x += t->rect().width() - overlap;
-            r = r.unite( t->rect() );
-        }
+  t = tab(i);
+  // if (( i < (middleTab - 1) ) || ( i > (middleTab + 1) )) {
+  if ( i != middleTab ) {
+      int w = hiddenTabWidth;
+      int ih = 0;
+      if ( t->iconSet() != 0 ) {
+    w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
+    ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+      }
+      int h = QMAX( fm.height(), ih );
+      h = QMAX( h, QApplication::globalStrut().height() );
+
+      h += vframe;
+      w += hframe;
+
+      t->setRect( QRect(x, 0, w, h) );
+      x += t->rect().width() - overlap;
+      r = r.unite( t->rect() );
+  } else {
+      int w = fm.width( t->text() );
+      int ih = 0;
+      if ( t->iconSet() != 0 ) {
+    w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
+    ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+      }
+      int h = QMAX( fm.height(), ih );
+      h = QMAX( h, QApplication::globalStrut().height() );
+
+      h += vframe;
+      w += hframe;
+
+      // t->setRect( QRect(x, 0, w * available/required, h) );
+      t->setRect( QRect(x, 0, available, h) );
+      x += t->rect().width() - overlap;
+      r = r.unite( t->rect() );
+  }
     }
@@ -342,3 +342,3 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
     if ( selected )
-        f.setBold( TRUE );
+  f.setBold( TRUE );
     p->setFont( f );
@@ -348,4 +348,4 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
     if ( t->iconSet() != 0 ) {
-        iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 2;
-        ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+  iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 2;
+  ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
     }
@@ -354,9 +354,9 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
     paintLabel( p, QRect( r.left() + (r.width()-w)/2 - 3,
-                          r.top() + (r.height()-h)/2, w, h ), t,
+        r.top() + (r.height()-h)/2, w, h ), t,
 #if QT_VERSION >= 300
-                            t->identifier() == keyboardFocusTab()
+          t->identifier() == keyboardFocusTab()
 #else
-                            t->identitifer() == keyboardFocusTab()
+          t->identitifer() == keyboardFocusTab()
 #endif
-                );
+    );
 }
@@ -365,3 +365,3 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
 void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
-                          QTab* t, bool has_focus ) const
+        QTab* t, bool has_focus ) const
 {
@@ -372,11 +372,11 @@ void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
     if ( t->iconSet() ) {
-        // the tab has an iconset, draw it in the right mode
-        QIconSet::Mode mode = (t->isEnabled() && isEnabled()) ? QIconSet::Normal : QIconSet::Disabled;
-        if ( mode == QIconSet::Normal && has_focus )
-            mode = QIconSet::Active;
-        QPixmap pixmap = t->iconSet()->pixmap( QIconSet::Small, mode );
-        int pixw = pixmap.width();
-        int pixh = pixmap.height();
-        p->drawPixmap( r.left() + 6, r.center().y() - pixh / 2 + 1, pixmap );
-        r.setLeft( r.left() + pixw + 5 );
+  // the tab has an iconset, draw it in the right mode
+  QIconSet::Mode mode = (t->isEnabled() && isEnabled()) ? QIconSet::Normal : QIconSet::Disabled;
+  if ( mode == QIconSet::Normal && has_focus )
+      mode = QIconSet::Active;
+  QPixmap pixmap = t->iconSet()->pixmap( QIconSet::Small, mode );
+  int pixw = pixmap.width();
+  int pixh = pixmap.height();
+  p->drawPixmap( r.left() + 6, r.center().y() - pixh / 2 + 1, pixmap );
+  r.setLeft( r.left() + pixw + 5 );
     }
@@ -386,3 +386,3 @@ void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
     if ( r.width() < 20 )
-        return;
+  return;
 
@@ -390,13 +390,13 @@ void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
 #if defined(_WS_WIN32_)
-        if ( colorGroup().brush( QColorGroup::Button ) == colorGroup().brush( QColorGroup::Background ) )
-            p->setPen( colorGroup().buttonText() );
-        else
-            p->setPen( colorGroup().foreground() );
+  if ( colorGroup().brush( QColorGroup::Button ) == colorGroup().brush( QColorGroup::Background ) )
+      p->setPen( colorGroup().buttonText() );
+  else
+      p->setPen( colorGroup().foreground() );
 #else
-        p->setPen( colorGroup().foreground() );
+  p->setPen( colorGroup().foreground() );
 #endif
-        p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
+  p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
     } else {
-        p->setPen( palette().disabled().foreground() );
-        p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
+  p->setPen( palette().disabled().foreground() );
+  p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
     }
@@ -425,7 +425,7 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
     connect( tabs, SIGNAL(selected(const QString&)),
-        this, SLOT(viewSelected(const QString&)) );
+  this, SLOT(viewSelected(const QString&)) );
     connect( tabs, SIGNAL(clicked(const AppLnk*)),
-        this, SLOT(select(const AppLnk*)));
+  this, SLOT(select(const AppLnk*)));
     connect( tabs, SIGNAL(rightPressed(AppLnk*)),
-        this, SLOT(properties(AppLnk*)));
+  this, SLOT(properties(AppLnk*)));
 
@@ -457,4 +457,4 @@ static bool isVisibleWindow(int wid)
     for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
-        if ( w->winId() == wid )
-            return !w->isFullyObscured();
+  if ( w->winId() == wid )
+      return !w->isFullyObscured();
     }
@@ -466,5 +466,5 @@ void Launcher::showMaximized()
     if ( isVisibleWindow( winId() ) )
-        doMaximize();
+  doMaximize();
     else
-        QTimer::singleShot( 20, this, SLOT(doMaximize()) );
+  QTimer::singleShot( 20, this, SLOT(doMaximize()) );
 }
@@ -485,8 +485,8 @@ void Launcher::updateMimeTypes(AppLnkSet* folder)
     for ( QListIterator<AppLnk> it( folder->children() ); it.current(); ++it ) {
-        AppLnk *app = it.current();
-        if ( app->type() == "Folder" )
-            updateMimeTypes((AppLnkSet *)app);
-        else {
-            MimeType::registerApp(*app);
-        }
+  AppLnk *app = it.current();
+  if ( app->type() == "Folder" )
+      updateMimeTypes((AppLnkSet *)app);
+  else {
+      MimeType::registerApp(*app);
+  }
     }
@@ -533,13 +533,13 @@ void Launcher::select( const AppLnk *appLnk )
     if ( appLnk->type() == "Folder" ) {
-        // Not supported: flat is simpler for the user
+  // 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();
+  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();
     }
@@ -556,14 +556,14 @@ void Launcher::properties( AppLnk *appLnk )
     if ( appLnk->type() == "Folder" ) {
-        // Not supported: flat is simpler for the user
+  // 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);
-        }
+  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);
+  }
     }
@@ -574,7 +574,7 @@ void Launcher::updateLink(const QString& link)
     if (link.isNull())
-        updateTabs();
+  updateTabs();
     else if (link.isEmpty())
-        updateDocs();
+  updateDocs();
     else
-        tabs->updateLink(link);
+  tabs->updateLink(link);
 }
@@ -585,56 +585,56 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
     if ( msg == "linkChanged(QString)" ) {
-        QString link;
-        stream >> link;
-        if ( in_lnk_props ) {
-            got_lnk_change = TRUE;
-            lnk_change = link;
-        } else {
-            updateLink(link);
-        }
+  QString link;
+  stream >> link;
+  if ( in_lnk_props ) {
+      got_lnk_change = TRUE;
+      lnk_change = link;
+  } else {
+      updateLink(link);
+  }
     } else if ( msg == "busy()" ) {
-        emit busy();
+  emit busy();
     } else if ( msg == "notBusy(QString)" ) {
-        QString app;
-        stream >> app;
-        tabs->setBusy(FALSE);
-        emit notBusy(app);
+  QString app;
+  stream >> app;
+  tabs->setBusy(FALSE);
+  emit notBusy(app);
     } else if ( msg == "mkdir(QString)" ) {
-        QString dir;
-        stream >> dir;
-        if ( !dir.isEmpty() )
-            mkdir( dir );
+  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 );
+  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 );
+  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;
+  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 );
+  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.
+  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)" ) {
@@ -645,3 +645,3 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
       if ( appName.compare("clear") == 0){
-        cfg.writeEntry("Apps", "");
+  cfg.writeEntry("Apps", "");
       }
@@ -653,15 +653,15 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
       if ( modifier.compare("add") == 0 ){
-        // only add it appname is entered
-        if (!appName.isEmpty()) {
-          cfg.writeEntry("Apps", appName);
-        }
+  // only add it 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", "");
-        }
+  // 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", "");
+  }
       }
@@ -670,99 +670,99 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
         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;
+  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() );
+  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());
+  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() ) );
+  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;
+  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;
+  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;
     }
@@ -778,6 +778,6 @@ void Launcher::storageChanged()
     if ( in_lnk_props ) {
-        got_lnk_change = TRUE;
-        lnk_change = "";
+  got_lnk_change = TRUE;
+  lnk_change = "";
     } else {
-        updateDocs();
+  updateDocs();
     }
@@ -790,3 +790,3 @@ bool Launcher::mkdir(const QString &localPath)
     if (fullDir.exists())
-        return true;
+  return true;
 
@@ -802,4 +802,4 @@ bool Launcher::mkdir(const QString &localPath)
     if (dirIndex == -1) {
-        //qDebug("No seperators found in path %s", localPath.latin1());
-        checkedPath = QDir::currentDirPath();
+  //qDebug("No seperators found in path %s", localPath.latin1());
+  checkedPath = QDir::currentDirPath();
     }
@@ -807,21 +807,21 @@ bool Launcher::mkdir(const QString &localPath)
     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;
-            }
-        }
+  // 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;
+      }
+  }
 
@@ -837,3 +837,3 @@ void Launcher::preloadApps()
     for (QStringList::ConstIterator it=apps.begin(); it!=apps.end(); ++it) {
-        QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
+  QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
     }