try to fix crash when insert drive. please test.

1 files changed, 8 insertions, 8 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index d9fc8e4..5f050aa 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -1,375 +1,375 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
 //      have this class.
 #define QTOPIA_INTERNAL_FSLP
 
 //#include <opie/ofiledialog.h>
 #include <opie/ofileselector.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/mimetype.h>
 #include <qpe/storage.h>
 #include <qpe/palmtoprecord.h>
 
 #include <qpe/version.h>
 
 #include <qdir.h>
 #ifdef QWS
 #include <qwindowsystem_qws.h>
 #endif
 #include <qtimer.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qlayout.h>
 #include <qstyle.h>
 #include <qpushbutton.h>
 #include <qtabbar.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qframe.h>
 #include <qpainter.h>
 #include <qlabel.h>
 #include <qtextstream.h>
 #include <qpopupmenu.h>
 
 #include <opie/owait.h>
 
 
 #include "launcherview.h"
 #include "launcher.h"
 #include "syncdialog.h"
 #include "desktop.h"
 #include <qpe/lnkproperties.h>
 //#include "mrulist.h"
 #include "qrsync.h"
 #include <stdlib.h>
 #include <unistd.h>
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <stdio.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
 #include <qpe/storage.h>
 #include "mediummountgui.h"
 
 namespace {
   QStringList configToMime( Config *cfg ){
     QStringList mimes;
     bool tmpMime = true;
     cfg->setGroup("mimetypes" );
     tmpMime = cfg->readBoolEntry("all" ,true);
     if( tmpMime ){
       mimes << QString::null;
       return mimes;
     }else{
       tmpMime = cfg->readBoolEntry("audio", true );
       if(tmpMime )
   mimes.append("audio/*" );
 
       tmpMime = cfg->readBoolEntry("image", true );
       if(tmpMime )
   mimes.append("image/*" );
 
       tmpMime = cfg->readBoolEntry("text", true );
       if(tmpMime )
   mimes.append("text/*");
 
       tmpMime = cfg->readBoolEntry("video", true );
       if(tmpMime )
   mimes.append("video/*" );
     }
     return mimes;
   }
 
 }
 
 
 
 //#define SHOW_ALL
 
 class CategoryTab : public QTab
 {
 public:
     CategoryTab( const QIconSet &icon, const QString &text=QString::null )
   : QTab( icon, text )
     {
     }
 
     QColor bgColor;
     QColor fgColor;
 };
 
 //===========================================================================
 
 CategoryTabWidget::CategoryTabWidget( QWidget* parent ) :
     QVBox( parent )
 {
     categoryBar = 0;
     stack = 0;
 }
 
 void CategoryTabWidget::prevTab()
 {
     if ( categoryBar ) {
   int n = categoryBar->count();
   int tab = categoryBar->currentTab();
   if ( tab >= 0 )
             categoryBar->setCurrentTab( (tab - 1 + n)%n );
     }
 }
 
 void CategoryTabWidget::nextTab()
 {
     if ( categoryBar ) {
   int n = categoryBar->count();
         int tab = categoryBar->currentTab();
   categoryBar->setCurrentTab( (tab + 1)%n );
     }
 }
 
 
 void CategoryTabWidget::showTab(const QString& id)
 {
     if ( categoryBar ) {
   int idx = ids.findIndex( id );
   categoryBar->setCurrentTab( idx );
     }
 }
 
 void CategoryTabWidget::addItem( const QString& linkfile )
 {
    int i=0;
    AppLnk *app = new AppLnk(linkfile);
    if ( !app->isValid() ) {
       delete app;
       app=0;
    }
    if ( !app || !app->file().isEmpty() ) {
       // A document
-      delete app;
-      app = new DocLnk(linkfile);
-      if ( app->fileKnown() ) {
-         ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
-      } else {
-         ((LauncherView*)(stack->widget(ids.count()-1)))->sort();
-         delete app;
-      }
+//        delete app;
+//        app = new DocLnk(linkfile);
+//        if ( app->fileKnown() ) {
+//           ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
+//        } else {
+//           ((LauncherView*)(stack->widget(ids.count()-1)))->sort();
+//           delete app;
+//        }
       return;
    }
    // An application
    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++;
       }
    }
 
    QCopEnvelope e("QPE/TaskBar","reloadApps()");
 }
 
 void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
  AppLnkSet* /*docFolder*/, const QList<FileSystem> & /*fs*/)
 {
    QString current;
     if ( categoryBar ) {
         int c = categoryBar->currentTab();
         if ( c >= 0 ) current = ids[c];
     }
 
     delete categoryBar;
     categoryBar = new CategoryTabBar( this );
     QPalette pal = categoryBar->palette();
     pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
     pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
     categoryBar->setPalette( pal );
 
     delete stack;
     stack = new QWidgetStack(this);
     tabs=0;
 
     ids.clear();
 
     Config cfg("Launcher");
 
     QStringList types = rootFolder->types();
     for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
   if ( !(*it).isEmpty() ) {
       (void)newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
       setTabAppearance( *it, cfg );
   }
     }
     QListIterator<AppLnk> it( rootFolder->children() );
     AppLnk* l;
     while ( (l=it.current()) ) {
   if ( l->type() == "Separator" ) { // No tr
       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;
     }
     rootFolder->detachChildren();
     for (int i=0; i<tabs; i++)
   ((LauncherView*)stack->widget(i))->sort();
 
     // all documents
     QImage img( Resource::loadImage( "DocsIcon" ) );
     QPixmap pm;
     pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
 
     //ljpotter
      CategoryTab *catTab ;
      catTab = new CategoryTab( pm, "Documents" );
         
      categoryBar->addTab( catTab );
 
      fileSel = new DocumentTab( stack, 4, 0, "/","");
      stack->addWidget( fileSel, tabs++ );
 
      //     fileSel->hide();     
 
      connect( fileSel, SIGNAL( fileSelected( const DocLnk & )),
               this, SLOT(clickie(const DocLnk&)) );
         
 //       connect( fileSel, SIGNAL( fileSelected( const QString & )),
 //                this, SLOT(clickie(const QString&)) );
 
      connect( categoryBar, SIGNAL(selected(int)), stack, SLOT(raiseWidget(int)) );
 
     ((LauncherView*)stack->widget(0))->setFocus();
 
     cfg. setGroup ( "GUI" );
     setBusyIndicatorType ( cfg. readEntry ( "BusyType", QString::null ));
 
     if ( !current.isNull() ) {
         showTab(current);
     }
 
     categoryBar->show();
     stack->show();
 
 
     QCopEnvelope e("QPE/TaskBar","reloadApps()");
 }
 
 void CategoryTabWidget::clickie(const DocLnk &lnk) {
    lnk.execute();
    //   fileSel->reparse();
 }
 
 void CategoryTabWidget::clickie(const QString &appStr) {
 //     DocLnk lnk(appStr);
 //     lnk.execute();
 }
 
 void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg )
 {
     QString grp( "Tab %1" ); // No tr
     cfg.setGroup( grp.arg(id) );
     LauncherView *v = view( id );
     int idx = ids.findIndex( id );
     CategoryTab *tab = (CategoryTab *)categoryBar->tab( idx );
 
     // View
     QString view = cfg.readEntry( "View", "Icon" );
     if ( view == "List" ) // No tr
   v->setViewMode( LauncherView::List );
     QString bgType = cfg.readEntry( "BackgroundType", "Image" );
     if ( bgType == "Image" ) { // No tr
   QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" );
   v->setBackgroundType( LauncherView::Image, pm );
     } else if ( bgType == "SolidColor" ) {
   QString c = cfg.readEntry( "BackgroundColor" );
   v->setBackgroundType( LauncherView::SolidColor, c );
     }
     QString textCol = cfg.readEntry( "TextColor" );
     if ( textCol.isEmpty() )
   v->setTextColor( QColor() );
     else
   v->setTextColor( QColor(textCol) );
     QStringList font = cfg.readListEntry( "Font", ',' );
     if ( font.count() == 4 )
   v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) );
 
     // Tabs
     QString tabCol = cfg.readEntry( "TabColor" );
     if ( tabCol.isEmpty() )
   tab->bgColor = QColor();
     else
   tab->bgColor = QColor(tabCol);
     QString tabTextCol = cfg.readEntry( "TabTextColor" );
     if ( tabTextCol.isEmpty() )
   tab->fgColor = QColor();
     else
   tab->fgColor = QColor(tabTextCol);
 }
 
 //void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> & /*fs*/)
 //{
    //     docFolder->detachChildren();
 //}
 
 void CategoryTabWidget::tabProperties()
 {
     LauncherView *view = (LauncherView*)stack->widget( categoryBar->currentTab() );
     QPopupMenu *m = new QPopupMenu( this );
     m->insertItem( tr("Icon View"), LauncherView::Icon );
     m->insertItem( tr("List View"), LauncherView::List );
     m->setItemChecked( (int)view->viewMode(), TRUE );
     int rv = m->exec( QCursor::pos() );
     if ( rv >= 0 && rv != view->viewMode() ) {
   view->setViewMode( (LauncherView::ViewMode)rv );
     }
 
     delete m;
 }
 
 QString CategoryTabWidget::getAllDocLinkInfo() const
 {
    return "";
 }
 
 LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label )
 {
     LauncherView* view = new LauncherView( stack );
     connect( view, SIGNAL(clicked(const AppLnk*)),
       this, SIGNAL(clicked(const AppLnk*)));
     connect( view, SIGNAL(rightPressed(AppLnk*)),
       this, SIGNAL(rightPressed(AppLnk*)));