1 files changed, 1 insertions, 1 deletions

diff --git a/library/applnk.cpp b/library/applnk.cpp
index 5185b5f..778ccab 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -215,257 +215,257 @@ AppLnk::AppLnk( const QString &file )
     QStringList::Iterator it;
     for ( i = 0, it = sl.begin(); it != sl.end();
           ++it, i++ ) {
 
         bool number;
         int id = (*it).toInt( &number );
         if ( !number ) {
             // convert from old school...
             id = cat.id( "Document Viewer", *it );
             if ( id == 0 )
                 id = cat.addCategory( "Document Viewer", *it );
         }
         d->mCat[i] = id;
     }
     mId = 0;
 }
 
 /*!
   Returns a small pixmap associated with the application.
 */
 const QPixmap& AppLnk::pixmap() const
 {
     if ( mPixmap.isNull() ) {
         AppLnk* that = (AppLnk*)this;
         if ( mIconFile.isEmpty() ) {
             MimeType mt(type());
             that->mPixmap = mt.pixmap();
             if ( that->mPixmap.isNull() )
                 that->mPixmap = Resource::loadPixmap("UnknownDocument-14");
             return that->mPixmap;
         }
         QImage unscaledIcon = Resource::loadImage( that->mIconFile );
         that->mPixmap.convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
         that->mBigPixmap.convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
         return that->mPixmap;
     }
     return mPixmap;
 }
 
 /*!
   Returns a large pixmap associated with the application.
 */
 const QPixmap& AppLnk::bigPixmap() const
 {
     if ( mBigPixmap.isNull() ) {
         AppLnk* that = (AppLnk*)this;
         if ( mIconFile.isEmpty() ) {
             MimeType mt(type());
             that->mBigPixmap = mt.bigPixmap();
             if ( that->mBigPixmap.isNull() )
                 that->mBigPixmap = Resource::loadPixmap("UnknownDocument");
             return that->mBigPixmap;
         }
         QImage unscaledIcon = Resource::loadImage( that->mIconFile );
         that->mPixmap.convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
         that->mBigPixmap.convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
         return that->mBigPixmap;
     }
     return mBigPixmap;
 }
 
 /*!
   Returns the type of the application.
 */
 QString AppLnk::type() const
 {
     if ( mType.isNull() ) {
         AppLnk* that = (AppLnk*)this;
         MimeType mt(file());
         that->mType = mt.id();
         return that->mType;
     }
     return mType;
 }
 
 /*!
   Returns the file associated with the AppLnk.
 
   \sa exec()
 */
 QString AppLnk::file() const
 {
     if ( mFile.isNull() ) {
         AppLnk* that = (AppLnk*)this; // copy?
         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;
         } else if ( mType.contains('/') ) {
             that->mFile =
                 QString(getenv("HOME"))+"/Documents/"+mType+"/"+safeFileName(that->mName);
             if ( QFile::exists(that->mFile+ext) || QFile::exists(that->mFile+".desktop") ) { // a .desktop with the same name exists
                 int n=1;
                 qWarning("AppLnk::file() n=1 %s", that->mFile.latin1() );
                 QString nn;
                 while (QFile::exists((nn=(that->mFile+"_"+QString::number(n)))+ext)
                         || QFile::exists(nn+".desktop"))
                     n++;
                 that->mFile = nn;
                 qWarning("AppLnl::file() now mFile is %s", that->mFile.latin1() );
             }
             that->mLinkFile = that->mFile+".desktop";
             that->mFile += ext;
         }
         prepareDirectories(that->mFile);
         QFile f(that->mFile);
         if ( !f.open(IO_WriteOnly) )
             that->mFile = QString::null;
         return that->mFile;
     }
     return mFile;
 }
 
 /*!
   Returns the desktop file coresponding to this AppLnk.
 
   \sa file(), exec()
 */
 QString AppLnk::linkFile() const
 {
     if ( mLinkFile.isNull() ) {
         AppLnk* that = (AppLnk*)this;
         if ( type().contains('/') ) {
             StorageInfo storage;
             const FileSystem *fs = storage.fileSystemOf( that->mFile );
-            if ( fs && fs->isRemovable() ) {
+            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);
             if ( QFile::exists(that->mLinkFile+".desktop") ) { // ok the file exists lets check if we point to the same file
                 int n=1;
                 QString nn;
                 AppLnk lnk( that->mLinkFile+".desktop" );
                 if(that->file() != lnk.file() ){
                   qWarning("AppLnk::linkFile exists %s", that->mLinkFile.latin1() );
                   while (QFile::exists((nn=that->mLinkFile+"_"+QString::number(n))+".desktop")){
                     n++;
                     AppLnk lnk(nn ); // just to be sure
                     if(lnk.file() ==that->file() ){ 
                       break;
                     }   
                   }    
                   that->mLinkFile = nn;
                 }
             }
             that->mLinkFile += ".desktop";
             qWarning("AppLnk::linkFile is %s", that->mLinkFile.latin1() );
             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;
 }
 
 /*!
   Destroys the AppLnk. Note that if the AppLnk is current 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;
 }
 
 /*!
   Executes the application associated with this AppLnk.
 */
 void AppLnk::execute() const
 {
     execute(QStringList());
 }
 
 /*!
   Executes the application associated with this AppLnk, with
   \a args as arguments.
 */
 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, you should not call it directly.
 
   \sa execute()
 */
 void AppLnk::invoke(const QStringList& args) const
 {
     Global::execute( exec(), args[0] );
 }
 
 /*!
   Sets the Exec property to \a exec.
 
   \sa exec()
 */
 void AppLnk::setExec( const QString& exec )
 {
     mExec = exec;
 }
 
 /*!
   Sets the Name property to \a docname.
 
   \sa name()
 */
 void AppLnk::setName( const QString& docname )
 {
     mName = docname;
 }
 
 /*!
   Sets the File property to \a filename.