2 files changed, 8 insertions, 4 deletions

diff --git a/library/applnk.cpp b/library/applnk.cpp
index 5f7da8e..e9d519e 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -511,986 +511,986 @@ const QPixmap& AppLnk::bigPixmap() const
 }
 
 /*!
   Returns the type of the AppLnk. For applications, games and
   settings the type is \c Application; for documents the type is the
   document's MIME type.
 */
 QString AppLnk::type() const
 {
     if ( mType.isNull() ) {
   AppLnk* that = (AppLnk*)this;
   QString f = file();
   if ( !f.isNull() ) {
       MimeType mt(f);
       that->mType = mt.id();
       return that->mType;
   }
     }
     return mType;
 }
 
 /*!
   Returns the file associated with the AppLnk.
 
   \sa exec() name()
 */
 QString AppLnk::file() const
 {
     if ( mExec.isEmpty ( ) && mFile.isNull() ) {
   AppLnk* that = (AppLnk*)this;
   QString ext = MimeType(mType).extension();
   if ( !ext.isEmpty() )
       ext = "." + ext;
   if ( !mLinkFile.isEmpty() ) {
       that->mFile =
     mLinkFile.right(8)==".desktop" // 8 = strlen(".desktop")
         ? mLinkFile.left(mLinkFile.length()-8) : mLinkFile;
   qDebug("mFile now == %s", mFile.latin1());
   } else if ( mType.contains('/') ) {
       that->mFile =
     QString(getenv("HOME"))+"/Documents/"+mType+"/"+safeFileName(that->mName);
             /*
              * A file with the same name or a .desktop file already exists
              */
       if ( QFile::exists(that->mFile+ext) || QFile::exists(that->mFile+".desktop") ) {
     int n=1;
     QString nn;
     while (QFile::exists((nn=(that->mFile+"_"+QString::number(n)))+ext)
       || QFile::exists(nn+".desktop"))
         n++;
     that->mFile = nn;
       }
       that->mLinkFile = that->mFile+".desktop";
       that->mFile += ext;
   }
   prepareDirectories(that->mFile);
   if ( !that->mFile.isEmpty() ) {
       QFile f(that->mFile);
       if ( !f.open(IO_WriteOnly) )
     that->mFile = QString::null;
       return that->mFile;
   }
     }
     return mFile;
 }
 
 /*!
   Returns the desktop file corresponding to this AppLnk.
 
   \sa file() exec() name()
 */
 QString AppLnk::linkFile() const
 {
     if ( mLinkFile.isNull() ) {
   AppLnk* that = (AppLnk*)this;
   if ( type().contains('/') ) {
       StorageInfo storage;
       const FileSystem *fs = storage.fileSystemOf( that->mFile );
             /* tmpfs + and ramfs are available too but not removable
              * either we fix storage or add this
              */
       if ( fs && ( fs->isRemovable() || fs->disk() == "/dev/mtdblock6" || fs->disk() == "tmpfs") ) {
     that->mLinkFile = fs->path();
       } else
     that->mLinkFile = getenv( "HOME" );
       that->mLinkFile += "/Documents/"+type()+"/"+safeFileName(that->mName);
 
             /* the desktop file exists make sure we don't point to the same file */
       if ( QFile::exists(that->mLinkFile+".desktop") ) {
                 AppLnk lnk( that->mLinkFile + ".desktop" );
 
                 /* the linked is different */
                 if(that->file() != lnk.file() ) {
                     int n = 1;
                     QString nn;
                     while (QFile::exists((nn=that->mLinkFile+"_"+QString::number(n))+".desktop")) {
                         n++;
                         /* just to be sure */
                         AppLnk lnk(nn );
                         if (lnk.file() == that->file() )
                             break;
                     }
                     that->mLinkFile = nn;
                 }
       }
       that->mLinkFile += ".desktop";
       storeLink();
   }
   return that->mLinkFile;
     }
     return mLinkFile;
 }
 
 /*!
   Copies \a copy.
 */
 AppLnk::AppLnk( const AppLnk &copy )
 {
     mName = copy.mName;
     mPixmap = copy.mPixmap;
     mBigPixmap = copy.mBigPixmap;
     mExec = copy.mExec;
     mType = copy.mType;
     mRotation = copy.mRotation;
     mComment = copy.mComment;
     mFile = copy.mFile;
     mLinkFile = copy.mLinkFile;
     mIconFile = copy.mIconFile;
     mMimeTypes = copy.mMimeTypes;
     mMimeTypeIcons = copy.mMimeTypeIcons;
     mId = 0;
     d = new AppLnkPrivate();
     d->mCat = copy.d->mCat;
     d->mCatList = copy.d->mCatList;
     d->mPixmaps = copy.d->mPixmaps;
 }
 
 /*!
   Destroys the AppLnk. Note that if the AppLnk is currently a member
   of an AppLnkSet, this will produce a run-time warning.
 
   \sa AppLnkSet::add() AppLnkSet::remove()
 */
 AppLnk::~AppLnk()
 {
     if ( mId )
   qWarning("Deleting AppLnk that is in an AppLnkSet");
     if ( d )
   delete d;
 }
 
 /*!
   \overload
   Executes the application associated with this AppLnk.
 
   \sa exec()
 */
 void AppLnk::execute() const
 {
     execute( QStringList::split( ' ', property( "Arguments" ) ) );
 }
 
 /*!
   Executes the application associated with this AppLnk, with
   \a args as arguments.
 
   \sa exec()
 */
 void AppLnk::execute(const QStringList& args) const
 {
 #ifdef Q_WS_QWS
     if ( !mRotation.isEmpty() ) {
   // ######## this will only work in the server
   int rot = QPEApplication::defaultRotation();
   rot = (rot+mRotation.toInt())%360;
   QCString old = getenv("QWS_DISPLAY");
   setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
   invoke(args);
   setenv("QWS_DISPLAY", old.data(), 1);
     } else
 #endif
   invoke(args);
 }
 
 /*!
   Invokes the application associated with this AppLnk, with
   \a args as arguments. Rotation is not taken into account by
   this function, so you should not call it directly.
 
   \sa execute()
 */
 void AppLnk::invoke(const QStringList& args) const
 {
     if ( property( "Arguments" ).isEmpty() )
         Global::execute( exec(), args[0] );
     else
         Global::execute( exec(), args.join( " " ) );
 }
 
 /*!
   Sets the Exec property to \a exec.
 
   \sa exec() name()
 */
 void AppLnk::setExec( const QString& exec )
 {
     mExec = exec;
 }
 
 #if 0 // this was inlined for better BC
 /*!
   Sets the Rotation property to \a rot.
 
   \sa rotation()
 */
 void AppLnk::setRotation ( const QString &rot )
 {
   mRotation = rot;
 }
 #endif
 
 /*!
   Sets the Name property to \a docname.
 
   \sa name()
 */
 void AppLnk::setName( const QString& docname )
 {
     mName = docname;
 }
 
 /*!
   Sets the File property to \a filename.
 
   \sa file() name()
 */
 void AppLnk::setFile( const QString& filename )
 {
     mFile = filename;
 }
 
 /*!
   Sets the LinkFile property to \a filename.
 
   \sa linkFile()
 */
 void AppLnk::setLinkFile( const QString& filename )
 {
     mLinkFile = filename;
 }
 
 /*!
   Sets the Comment property to \a comment.
 
   This text is displayed in the 'Details Dialog', for example if the
   user uses the 'press-and-hold' gesture.
 
   \sa comment()
 */
 void AppLnk::setComment( const QString& comment )
 {
     mComment = comment;
 }
 
 /*!
   Sets the Type property to \a type.
 
   For applications, games and settings the type should be \c
   Application; for documents the type should be the document's MIME
   type.
 
   \sa type()
 */
 void AppLnk::setType( const QString& type )
 {
     mType = type;
 }
 
 /*!
   \fn QString AppLnk::icon() const
 
   Returns the Icon property.
 
   \sa setIcon()
 */
 
 /*!
   Sets the Icon property to \a iconname. This is the filename from
   which the pixmap() and bigPixmap() are obtained.
 
   \sa icon() setSmallIconSize() setBigIconSize()
 */
 void AppLnk::setIcon( const QString& iconname )
 {
     mIconFile = iconname;
     QImage unscaledIcon = Resource::loadImage( mIconFile );
     d->mPixmaps[0].convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
     d->mPixmaps[1].convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
 }
 
 /*!
   Sets the Categories property to \a c.
 
   See the CategoryWidget for more details.
 
   \sa categories()
 */
 void AppLnk::setCategories( const QArray<int>& c )
 {
     d->mCat = c;
     d->updateCatListFromArray();
 }
 
 /*!
   \fn QStringList AppLnk::mimeTypeIcons() const
 
   Returns the MimeTypeIcons property of the AppLnk.
 */
 
 /*!
   Attempts to ensure that the link file for this AppLnk exists,
   including creating any required directories. Returns TRUE if
   successful; otherwise returns FALSE.
 
   You should not need to use this function.
 */
 bool AppLnk::ensureLinkExists() const
 {
     QString lf = linkFile();
     return prepareDirectories(lf);
 }
 
 /*!
   Commits the AppLnk to disk. Returns TRUE if the operation succeeded;
   otherwise returns FALSE.
 
   In addition, the "linkChanged(QString)" message is sent to the
   "QPE/System" \link qcop.html QCop\endlink channel.
 */
 bool AppLnk::writeLink() const
 {
     // Only re-writes settable parts
     QString lf = linkFile();
     if ( !ensureLinkExists() )
   return FALSE;
     storeLink();
     return TRUE;
 }
 
 /*!
   \internal
 */
 void AppLnk::storeLink() const
 {
     Config config( mLinkFile, Config::File );
     config.setGroup("Desktop Entry");
     config.writeEntry("Name",mName);
     if ( !mIconFile.isNull() ) config.writeEntry("Icon",mIconFile);
     config.writeEntry("Type",type());
     if(!rotation().isEmpty())
   config.writeEntry("Rotation",rotation());
     else
   config.removeEntry("Rotation");
     if ( !mComment.isNull() ) config.writeEntry("Comment",mComment);
     QString f = file();
     int i = 0;
     while ( i < (int)f.length() && i < (int)mLinkFile.length() && f[i] == mLinkFile[i] )
   i++;
     while ( i && f[i] != '/' )
   i--;
     // simple case where in the same directory
     if ( mLinkFile.find( '/', i + 1 ) < 0 )
   f = f.mid(i+1);
     // ### could do relative ie ../../otherDocs/file.doc
     config.writeEntry("File",f);
     config.writeEntry( "Categories", d->mCatList, ';' );
 
 #ifndef QT_NO_COP
     QCopEnvelope e("QPE/System", "linkChanged(QString)");
     e << mLinkFile;
 #endif
 }
 
 /*!
   Sets the property named \a key to \a value.
 
   \sa property()
 */
 void AppLnk::setProperty(const QString& key, const QString& value)
 {
     if ( ensureLinkExists() ) {
   Config cfg(linkFile(), Config::File);
   cfg.writeEntry(key,value);
     }
 }
 
 /*!
   Returns the property named \a key.
 
   \sa setProperty()
 */
 QString AppLnk::property(const QString& key) const
 {
     QString lf = linkFile();
     if ( !QFile::exists(lf) )
   return QString::null;
     Config cfg(lf, Config::File);
     return cfg.readEntry(key);
 }
 
 bool AppLnk::isPreloaded() const {
   // Preload information is stored in the Launcher config in v1.5.
   Config cfg("Launcher");
   cfg.setGroup("Preload");
   QStringList apps = cfg.readListEntry("Apps",',');
   if (apps.contains(exec()))
     return true;
   return false;
 }
 
 void AppLnk::setPreloaded(bool yesNo) {
   // Preload information is stored in the Launcher config in v1.5.
   Config cfg("Launcher");
   cfg.setGroup("Preload");
   QStringList apps = cfg.readListEntry("Apps", ',');
   if (apps.contains(exec()) && !yesNo)
     apps.remove(exec());
   else if (yesNo && !apps.contains(exec()))
     apps.append(exec());
   cfg.writeEntry("Apps", apps, ',');
 }
 
 
 /*!
   Deletes both the linkFile() and the file() associated with this AppLnk.
 
   \sa removeLinkFile()
 */
 void AppLnk::removeFiles()
 {
     bool valid = isValid();
     if ( !valid || !linkFileKnown() || QFile::remove(linkFile()) ) {
   if ( QFile::remove(file()) ) {
 #ifndef QT_NO_COP
       QCopEnvelope e("QPE/System", "linkChanged(QString)");
       if ( linkFileKnown() )
     e << linkFile();
       else
     e << file();
 #endif
   } else if ( valid ) {
       // restore link
       writeLink();
   }
     }
 }
 
 /*!
   Deletes the linkFile(), leaving any file() untouched.
 
     \sa removeFiles()
 */
 void AppLnk::removeLinkFile()
 {
     if ( isValid() && linkFileKnown() && QFile::remove(linkFile()) ) {
 #ifndef QT_NO_COP
   QCopEnvelope e("QPE/System", "linkChanged(QString)");
   e << linkFile();
 #endif
     }
 }
 
 class AppLnkSetPrivate {
 public:
     AppLnkSetPrivate()
     {
   typPix.setAutoDelete(TRUE);
   typPixBig.setAutoDelete(TRUE);
   typName.setAutoDelete(TRUE);
     }
 
     QDict<QPixmap> typPix;
     QDict<QPixmap> typPixBig;
     QDict<QString> typName;
 };
 
 /*!
   \class AppLnkSet applnk.h
   \brief The AppLnkSet class is a set of AppLnk objects.
 */
 
 /*!
   \fn QStringList AppLnkSet::types() const
 
   Returns the list of \link applnk.html#Types types\endlink in the set.
 
     For applications, games and settings the type is \c Application;
     for documents the type is the document's MIME type.
 
   \sa AppLnk::type(), typeName(), typePixmap(), typeBigPixmap()
 */
 
 /*!
   \fn const QList<AppLnk>& AppLnkSet::children() const
 
   Returns the members of the set.
 */
 
 /*!
   Constructs an empty AppLnkSet.
 */
 AppLnkSet::AppLnkSet() :
     d(new AppLnkSetPrivate)
 {
 }
 
 /*!
   Constructs an AppLnkSet that contains AppLnk objects representing
   all the files in the given \a directory (and any subdirectories
   recursively).
 
   \omit
   The directories may contain ".directory" files which override
   any AppLnk::type() values for AppLnk objects found in the directory.
   This allows simple localization of application types.
   \endomit
 */
 AppLnkSet::AppLnkSet( const QString &directory ) :
     d(new AppLnkSetPrivate)
 {
     QDir dir( directory );
     mFile = directory;
     findChildren(directory,QString::null,QString::null);
 }
 
 /*!
   Detaches all AppLnk objects from the set. The set become empty and
   the caller becomes responsible for deleting the AppLnk objects.
 */
 void AppLnkSet::detachChildren()
 {
     QListIterator<AppLnk> it( mApps );
     for ( ; it.current(); ) {
   AppLnk* a = *it;
   ++it;
   a->mId = 0;
     }
     mApps.clear();
 }
 
 /*!
   Destroys the set, deleting all the AppLnk objects it contains.
 
   \sa detachChildren()
 */
 AppLnkSet::~AppLnkSet()
 {
     QListIterator<AppLnk> it( mApps );
     for ( ; it.current(); ) {
   AppLnk* a = *it;
   ++it;
   a->mId = 0;
   delete a;
     }
     delete d;
 }
 
 void AppLnkSet::findChildren(const QString &dr, const QString& typ, const QString& typName, int depth)
 {
     depth++;
     if ( depth > 10 )
   return;
 
     QDir dir( dr );
     QString typNameLocal = typName;
 
     if ( dir.exists( ".directory" ) ) {
   Config config( dr + "/.directory", Config::File );
   config.setGroup( "Desktop Entry" );
   typNameLocal = config.readEntry( "Name", typNameLocal );
   if ( !typ.isEmpty() ) {
       QString iconFile = config.readEntry( "Icon", "AppsIcon" );
       QImage unscaledIcon = Resource::loadImage( iconFile );
       QPixmap pm, bpm;
       pm.convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
       bpm.convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
       d->typPix.insert(typ, new QPixmap(pm));
       d->typPixBig.insert(typ, new QPixmap(bpm));
       d->typName.insert(typ, new QString(typNameLocal));
   }
     }
 
     const QFileInfoList *list = dir.entryInfoList();
     if ( list ) {
   QFileInfo* fi;
   bool cadded=FALSE;
   for ( QFileInfoListIterator it(*list); (fi=*it); ++it ) {
       QString bn = fi->fileName();
 //      qDebug("findChildren "+bn);
       if ( bn[0] != '.' && bn != "CVS" ) {
     if ( fi->isDir() ) {
         QString c = typ.isNull() ? bn : typ+"/"+bn;
         QString d = typNameLocal.isNull() ? bn : typNameLocal+"/"+bn;
         findChildren(fi->filePath(), c, d, depth );
     } else {
         if ( fi->extension(FALSE) == "desktop" ) {
       AppLnk* app = new AppLnk( fi->filePath() );
 #ifdef QT_NO_QWS_MULTIPROCESS
       if ( !Global::isBuiltinCommand( app->exec() ) )
           delete app;
       else
 #endif
       {
           if ( !typ.isEmpty() ) {
         if ( !cadded ) {
             typs.append(typ);
             cadded = TRUE;
         }
         app->setType(typ);
           }
           add(app);
       }
         }
     }
       }
   }
     }
 }
 
 /*!
   Adds AppLnk \a f to the set. The set takes responsibility for
   deleting \a f.
 
   \sa remove()
 */
 void AppLnkSet::add( AppLnk *f )
 {
     if ( f->mId == 0 ) {
   AppLnk::lastId++;
   f->mId = AppLnk::lastId;
   mApps.append( f );
     } else {
   qWarning("Attempt to add an AppLnk twice");
     }
 }
 
 /*!
   Removes AppLnk \a f to the set. The caller becomes responsible for
   deleting \a f. Returns TRUE if \a f was in the set; otherwise
   returns FALSE.
 
   \sa add()
 */
 bool AppLnkSet::remove( AppLnk *f )
 {
     if ( mApps.remove( f ) ) {
   f->mId = 0;
   return TRUE;
     }
     return FALSE;
 }
 
 
 /*!
   Returns the localized name for type \a t.
 
     For applications, games and settings the type is \c Application;
     for documents the type is the document's MIME type.
 */
 QString AppLnkSet::typeName( const QString& t ) const
 {
     QString *st = d->typName.find(t);
     return st ? *st : QString::null;
 }
 
 /*!
   Returns the small pixmap associated with type \a t.
 
     For applications, games and settings the type is \c Application;
     for documents the type is the document's MIME type.
 */
 QPixmap AppLnkSet::typePixmap( const QString& t ) const
 {
     QPixmap *pm = d->typPix.find(t);
     return pm ? *pm : QPixmap();
 }
 
 /*!
   Returns the large pixmap associated with type \a t.
 
     For applications, games and settings the type is \c Application;
     for documents the type is the document's MIME type.
 */
 QPixmap AppLnkSet::typeBigPixmap( const QString& t ) const
 {
     QPixmap *pm = d->typPixBig.find(t);
     return pm ? *pm : QPixmap();
 }
 
 /*!
   Returns the AppLnk with the given \a id.
 */
 const AppLnk *AppLnkSet::find( int id ) const
 {
     QListIterator<AppLnk> it( children() );
 
     for ( ; it.current(); ++it ) {
   const AppLnk *app = it.current();
   if ( app->id() == id )
       return app;
     }
 
     return 0;
 }
 
 /*!
   Returns the AppLnk with the given \a exec attribute.
 */
 const AppLnk *AppLnkSet::findExec( const QString& exec ) const
 {
     QListIterator<AppLnk> it( children() );
 
     for ( ; it.current(); ++it ) {
   const AppLnk *app = it.current();
   if ( app->exec() == exec )
       return app;
     }
 
     return 0;
 }
 
 /*!
   \class DocLnkSet applnk.h
   \brief The DocLnkSet class is a set of DocLnk objects.
 */
 
 /*!
   \fn const QList<DocLnk>& DocLnkSet::children() const
 
   Returns the members of the set.
 */
 
 /*!
   Constructs an empty DocLnkSet.
 
   \sa appendFrom()
 */
 DocLnkSet::DocLnkSet()
 {
 }
 
 /*!
   Constructs a DocLnkSet that contains DocLnk objects representing all
   the files in the \a directory (and any subdirectories, recursively).
 
   If \a mimefilter is not null,
   only documents with a MIME type matching \a mimefilter are selected.
   The value may contain multiple wild-card patterns separated by ";",
   such as \c{*o/mpeg;audio/x-wav}.
 
   See also \link applnk.html#files-and-links Files and Links\endlink.
 
 */
 DocLnkSet::DocLnkSet( const QString &directory, const QString& mimefilter ) :
     AppLnkSet()
 {
     QDir dir( directory );
     mFile = dir.dirName();
-    QDict<void> reference;
+    QDict<void> reference(1021);
 
     QStringList subFilter = QStringList::split(";", mimefilter);
     QValueList<QRegExp> mimeFilters;
     for( QStringList::Iterator it = subFilter.begin(); it != subFilter.end(); ++ it )
   mimeFilters.append( QRegExp(*it, FALSE, TRUE) );
 
     findChildren(directory, mimeFilters, reference);
 
     const QList<DocLnk> &list = children();
     for ( QListIterator<DocLnk> it( list ); it.current(); ++it ) {
   reference.remove( (*it)->file() );
     }
     for ( QDictIterator<void> dit(reference); dit.current(); ++dit ) {
   if ( dit.current() == (void*)2 ) {
       // Unreferenced, make an unwritten link
       DocLnk* dl = new DocLnk;
       QFileInfo fi( dit.currentKey() );
       dl->setFile(fi.filePath());
       dl->setName(fi.baseName());
       // #### default to current path?
       // dl->setCategories( ... );
       bool match = mimefilter.isNull();
       if ( !match )
     for( QValueList<QRegExp>::Iterator it = mimeFilters.begin(); it != mimeFilters.end() && !match; ++ it )
         if ( (*it).match(dl->type()) >= 0 )
       match = TRUE;
       if ( match /* && dl->type() != "application/octet-stream" */
         && !!dl->exec() )
     add(dl);
       else
     delete dl;
   }
     }
 }
 
 // other becomes empty
 /*!
   Transfers all DocLnk objects from \a other to this set. \a other becomes
   empty.
 */
 void DocLnkSet::appendFrom( DocLnkSet& other )
 {
     if ( &other == this )
   return;
     QListIterator<AppLnk> it( other.mApps );
     for ( ; it.current(); ) {
   mApps.append(*it);
   ++it;
     }
     other.mApps.clear();
 }
 
 void DocLnkSet::findChildren(const QString &dr, const QValueList<QRegExp> &mimeFilters, QDict<void> &reference, int depth)
 {
     depth++;
     if ( depth > 10 )
   return;
 
     QDir dir( dr );
 
     /* Opie got a different approach
      * I guess it's geek vs. consumer
      * in this case to be discussed
      */
     if ( dir.exists( ".Qtopia-ignore" ) )
   return;
 
     const QFileInfoList *list = dir.entryInfoList();
     if ( list ) {
   QFileInfo* fi;
   for ( QFileInfoListIterator it(*list); (fi=*it); ++it ) {
       QString bn = fi->fileName();
       if ( bn[0] != '.' ) {
     if ( fi->isDir()  ) {
         if ( bn != "CVS" && bn != "Qtopia" && bn != "QtPalmtop" )
       findChildren(fi->filePath(), mimeFilters, reference, depth);
     } else {
         if ( fi->extension(FALSE) == "desktop" ) {
       DocLnk* dl = new DocLnk( fi->filePath() );
       QFileInfo fi2(dl->file());
       bool match = FALSE;
       if ( !fi2.exists() ) {
           dir.remove( dl->file() );
       }
       if ( mimeFilters.count() == 0 ) {
           add( dl );
           match = TRUE;
       } else {
           for( QValueList<QRegExp>::ConstIterator it = mimeFilters.begin(); it != mimeFilters.end(); ++ it ) {
         if ( (*it).match(dl->type()) >= 0 ) {
             add(dl);
             match = TRUE;
         }
           }
       }
       if ( !match )
           delete dl;
         } else {
       if ( !reference.find(fi->fileName()) )
           reference.insert(fi->filePath(), (void*)2);
         }
     }
       }
   }
     }
 }
 
 /*!
   \class DocLnk applnk.h
   \brief The DocLnk class represents loaded document references.
 */
 
 /*!
   \fn DocLnk::DocLnk( const DocLnk &o )
 
   Copies \a o.
 */
 
 /*!
   Constructs a DocLnk from a valid .desktop \a file or a new .desktop
   \a file for other files.
 */
 DocLnk::DocLnk( const QString &file ) :
     AppLnk(file)
 {
     init(file);
 }
 
 /*!
   Constructs a DocLnk from a valid .desktop \a file or a new .desktop
   \a file for other files. If \a may_be_desktopfile is TRUE, then an
   attempt is made to read \a file as a .desktop file; if that fails it
   is read as a normal file.
 */
 DocLnk::DocLnk( const QString &file, bool may_be_desktopfile ) :
     AppLnk(may_be_desktopfile ? file : QString::null)
 {
     init(file);
 }
 
 void DocLnk::init(const QString &file)
 {
     if ( isValid() ) {
 #ifndef FORCED_DIR_STRUCTURE_WAY
   if ( mType.isNull() )
       // try to infer it
 #endif
   {
       int s0 = file.findRev('/');
       if ( s0 > 0 ) {
     int s1 = file.findRev('/',s0-1);
     if ( s1 > 0 ) {
         int s2 = file.findRev('/',s1-1);
         if ( s2 > 0 ) {
       mType = file.mid(s2+1,s0-s2-1);
         }
     }
       }
   }
     } else if ( QFile::exists(file) ) {
   QString n = file;
   n.replace(QRegExp(".*/"),"");
   n.replace(QRegExp("\\..*"),"");
   setName( n );
   setFile( file );
     }
     MimeType mt(mType);
     if( mt.application() )
   mExec = mt.application()->exec();
 }
 
 /*!
   Constructs an invalid DocLnk.
 */
 DocLnk::DocLnk()
 {
 }
 
 /*!
   Destroys the DocLnk. Just like AppLnk objects, a run-time error
   occurs if the DocLnk is a member of a DocLnkSet (or AppLnkSet).
 */
 DocLnk::~DocLnk()
 {
 }
 
 /*!
   \reimp
 */
 QString DocLnk::exec() const
 {
     MimeType mt(type());
     const AppLnk* app = mt.application();
     if ( app )
   return app->exec();
     else
   return QString::null;
 }
 
 /*!
   \reimp
 */
 void DocLnk::invoke(const QStringList& args) const
 {
     MimeType mt(type());
     const AppLnk* app = mt.application();
     if ( app ) {
   QStringList a = args;
   if ( linkFileKnown() && QFile::exists( linkFile() ) )
       a.append(linkFile());
   else
       a.append(file());
   app->execute(a);
     }
 }
 
 
diff --git a/library/mimetype.cpp b/library/mimetype.cpp
index 23de70b..ec45794 100644
--- a/library/mimetype.cpp
+++ b/library/mimetype.cpp
@@ -1,366 +1,370 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_MIMEEXT
 #include "mimetype.h"
 #include "applnk.h"
 #include "resource.h"
 #include <qpe/qpeapplication.h>
 #include "config.h"
 
 #include <qfile.h>
 #include <qtextstream.h>
 
 
 static void cleanupMime()
 {
     MimeType::clear();
 }
 
 class MimeTypeData {
 public:
     MimeTypeData(const QString& i) :
         id(i)
     {
         apps.setAutoDelete(TRUE);
     }
     QString id;
     QString extension;
     QList<AppLnk> apps;
 
     QString description()
     {
         if ( desc.isEmpty() )
             desc = QPEApplication::tr("%1 document").arg(apps.first()->name());
         return desc;
     }
 
     QPixmap regIcon()
     {
         if ( regicon.isNull() )
             loadPixmaps();
         return regicon;
     }
 
     QPixmap bigIcon()
     {
         if ( bigicon.isNull() )
             loadPixmaps();
         return bigicon;
     }
 
 private:
     void loadPixmaps()
     {
         if ( apps.count() ) {
             QString icon;
             for (AppLnk* lnk = apps.first(); icon.isNull() && lnk; lnk=apps.next()) {
                 QStringList icons = lnk->mimeTypeIcons();
                 if ( icons.count() ) {
                     QStringList types = lnk->mimeTypes();
                     for (QStringList::ConstIterator t=types.begin(),i=icons.begin(); t!=types.end() && i!=icons.end(); ++i,++t) {
                         if ( *t == id ) {
                             icon = *i;
                             break;
                         }
                     }
                 }
             }
             if ( icon.isNull() ) {
                 AppLnk* lnk = apps.first();
                 regicon = lnk->pixmap();
                 bigicon = lnk->bigPixmap();
             } else {
                 QImage unscaledIcon = Resource::loadImage( icon );
                 regicon.convertFromImage( unscaledIcon.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
                 bigicon.convertFromImage( unscaledIcon.smoothScale( AppLnk::bigIconSize(), AppLnk::bigIconSize() ) );
             }
         }
     }
 
     QPixmap regicon;
     QPixmap bigicon;
     QString desc;
 };
 
 class MimeType::Private : public QDict<MimeTypeData> {
 public:
     Private() {}
     ~Private() {}
 
     // ...
 };
 
 MimeType::Private* MimeType::d=0;
 static QMap<QString,QString> *typeFor = 0;
 static QMap<QString,QStringList> *extFor = 0;
+static bool appsUpdated = FALSE;
 
 MimeType::Private& MimeType::data()
 {
     if ( !d ) {
         d = new Private;
         d->setAutoDelete(TRUE);
         static bool setCleanup = FALSE;
         if ( !setCleanup ) {
             qAddPostRoutine( cleanupMime );
             setCleanup = TRUE;
         }
     }
     return *d;
 }
 
 /*!
     \class MimeType mimetype.h
     \brief The MimeType class provides MIME type information.
 
     A MimeType object is a light-weight value which
     provides information about a MIME type.
 
     \ingroup qtopiaemb
 */
 
 /*!
     Constructs a MimeType.
     Normally, \a ext_or_id is a MIME type,
     but if \a ext_or_id starts with / or contains no /,
     it is interpretted as a filename and the
     extension (eg. .txt) is used as the
     MIME type.
 */
 MimeType::MimeType( const QString& ext_or_id )
 {
     init(ext_or_id);
 }
 
 /*!
     Constructs a MimeType from the type() of \a lnk.
 */
 MimeType::MimeType( const DocLnk& lnk )
 {
     init(lnk.type());
 }
 
 /*!
     Returns the MIME type identifier.
 */
 QString MimeType::id() const
 {
     return i;
 }
 
 /*!
     Returns a description of the MIME Type. This is usually based
     on the application() associated with the type.
 */
 QString MimeType::description() const
 {
     MimeTypeData* d = data(i);
     return d ? d->description() : QString::null;
 }
 
 /*!
     Returns a small QPixmap appropriate for the MIME type.
 */
 QPixmap MimeType::pixmap() const
 {
     MimeTypeData* d = data(i);
     return d ? d->regIcon() : QPixmap();
 }
 
 /*!
     \internal
     This function is not generally available.
 */
 QString MimeType::extension() const
 {
     return extensions().first();
 }
 
 
 /*!
     \internal
     This function is not generally available.
 */
 QStringList MimeType::extensions() const
 {
     loadExtensions();
     return *(*extFor).find(i);
 }
 
 /*!
     Returns a larger QPixmap appropriate for the MIME type.
 */
 QPixmap MimeType::bigPixmap() const
 {
     MimeTypeData* d = data(i);
     return d ? d->bigIcon() : QPixmap();
 }
 
 /*!
     Returns the AppLnk defining the application associated
     with this MIME type, or 0 if none is associated.
 
     The caller must not retain the pointer,
     but of course you can dereference it to take a copy if needed.
 
     \sa Service::binding()
 */
 const AppLnk* MimeType::application() const
 {
     MimeTypeData* d = data(i);
     return d ? d->apps.first() : 0;
 }
 
 static QString serviceBinding(const QString& service)
 {
     // Copied from qtopiaservices
     QString svrc = service;
     for (int i=0; i<(int)svrc.length(); i++)
         if ( svrc[i]=='/' ) svrc[i] = '-';
     return "Service-"+svrc;
 }
 
 /*!
     \internal
 */
 void MimeType::registerApp( const AppLnk& lnk )
 {
     QStringList list = lnk.mimeTypes();
     for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
         MimeTypeData* cur = data()[*it];
         AppLnk* l = new AppLnk(lnk);
         if ( !cur ) {
             cur = new MimeTypeData( *it );
             data().insert( *it, cur );
             cur->apps.append(l);
         } else if ( cur->apps.count() ) {
             Config binding(serviceBinding("Open/"+*it));
             binding.setGroup("Service");
             QString def = binding.readEntry("default");
             if ( l->exec() == def )
                 cur->apps.prepend(l);
             else
                 cur->apps.append(l);
         } else {
             cur->apps.append(l);
         }
     }
 }
 
 /*!
     \internal
 */
 void MimeType::clear()
 {
     delete d;
     d = 0;
+    delete typeFor; typeFor = 0;
+    delete extFor ; extFor  = 0;
+    appsUpdated = FALSE;
 }
 
 void MimeType::loadExtensions()
 {
     if ( !typeFor ) {
         extFor = new QMap<QString,QStringList>;
         typeFor = new QMap<QString,QString>;
         loadExtensions("/etc/mime.types");
         loadExtensions(QPEApplication::qpeDir()+"etc/mime.types");
     }
 }
 
 void MimeType::loadExtensions(const QString& filename)
 {
     QFile file(filename);
     if ( file.open(IO_ReadOnly) ) {
         QTextStream in(&file);
         QRegExp space("[ \t]+");
         while (!in.atEnd()) {
             QStringList tokens = QStringList::split(space, in.readLine());
             QStringList::ConstIterator it = tokens.begin();
             if ( it != tokens.end() ) {
                 QString id = *it; ++it;
                 // new override old (though left overrides right)
                 QStringList exts = (*extFor)[id];
                 QStringList newexts;
                 while ( it != tokens.end() ) {
                     exts.remove(*it);
                     if ( !newexts.contains(*it) )
                         newexts.append(*it);
                     (*typeFor)[*it] = id;
                     ++it;
                 }
                 (*extFor)[id] = newexts + exts;
             }
         }
     }
 }
 
 void MimeType::init( const QString& ext_or_id )
 {
     if ( ext_or_id[0] != '/' && ext_or_id.contains('/') ) {
         i = ext_or_id.lower();
     } else {
         loadExtensions();
         int dot = ext_or_id.findRev('.');
         QString ext = dot >= 0 ? ext_or_id.mid(dot+1) : ext_or_id;
         i = (*typeFor)[ext.lower()];
         if ( i.isNull() )
             i = "application/octet-stream";
     }
-    static bool appsUpdated = FALSE;
+
     if ( !appsUpdated ) {
-        appsUpdated = TRUE;
         updateApplications();
     }
 }
 
 MimeTypeData* MimeType::data(const QString& id)
 {
     MimeTypeData* d = data()[id];
     if ( !d ) {
         int s = id.find('/');
         QString idw = id.left(s)+"/*";
         d = data()[idw];
     }
     return d;
 }
 
 /*!
     Returns a Qtopia folder containing application definitions.
 */
 QString MimeType::appsFolderName()
 {
     return QPEApplication::qpeDir() + "apps";
 }
 
 /*!
     Reloads application definitions.
 */
 void MimeType::updateApplications()
 {
-    clear();
+//    clear();
+    appsUpdated = true;
     AppLnkSet apps( appsFolderName() );
     updateApplications(&apps);
 }
 
 void MimeType::updateApplications(AppLnkSet* folder)
 {
     for ( QListIterator<AppLnk> it( folder->children() ); it.current(); ++it ) {
         registerApp(*it.current());
     }
 }