1 files changed, 2 insertions, 2 deletions

diff --git a/library/applnk.cpp b/library/applnk.cpp
index 41b3008..1f053f3 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -370,195 +370,195 @@ AppLnk::AppLnk( const QString &file )
 	    for (QStringList::Iterator it=mMimeTypes.begin(); it!=mMimeTypes.end(); ++it)
 		*it = (*it).lower();
 	    mMimeTypeIcons = config.readListEntry( "MimeTypeIcons", ';' );
 	    mLinkFile = file;
 	    mFile = config.readEntry("File", QString::null);
 	    if ( mFile[0] != '/' ) {
 		int slash = file.findRev('/');
 		if ( slash >= 0 ) {
 		    mFile = file.left(slash) + '/' + mFile;
 		}
 	    }
 	    d->mCatList = config.readListEntry("Categories", ';');
 	    if ( d->mCatList[0].toInt() < -1 ) {
 		// numeric cats in file! convert to text
 		Categories cat( 0 );
 		cat.load( categoryFileName() );
 		d->mCat.resize( d->mCatList.count() );
 		int i;
 		QStringList::ConstIterator it;
 		for ( i = 0, it = d->mCatList.begin(); it != d->mCatList.end();
 		      ++it, i++ ) {
 		    bool number;
 		    int id = (*it).toInt( &number );
 		    if ( !number ) {
 			// convert from text
 			id = cat.id( "Document View", *it );
 			if ( id == 0 )
 			    id = cat.addCategory( "Document View", *it );
 		    }
 		    d->mCat[i] = id;
 		}
 		d->updateCatListFromArray();
 	    }
 	}
     }
     mId = 0;
 }
 
 AppLnk& AppLnk::operator=(const AppLnk &copy)
 {
     if ( mId )
 	qWarning("Deleting AppLnk that is in an AppLnkSet");
     if ( d )
 	delete d;
 
 
     mName = copy.mName;
 
     /* remove for Qtopia 3.0 -zecke */
     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;
 
     return *this;
 }
 /*!
   protected internally to share code
   should I document that at all?
   I don't know the TT style for that
 */
 const QPixmap& AppLnk::pixmap( int pos, int size ) const {
     if ( d->mPixmaps[pos].isNull() ) {
 	AppLnk* that = (AppLnk*)this;
 	if ( mIconFile.isEmpty() ) {
 	    MimeType mt(type());
 	    that->d->mPixmaps[pos] = mt.pixmap();
 	    if ( that->d->mPixmaps[pos].isNull() )
 		that->d->mPixmaps[pos].convertFromImage(
 		    Resource::loadImage("UnknownDocument")
 			.smoothScale( size, size ) );
 	    return that->d->mPixmaps[pos];
 	}
 	QImage unscaledIcon = Resource::loadImage( that->mIconFile );
 	if ( unscaledIcon.isNull() ) {
 	    qDebug( "Cannot find icon: %s", that->mIconFile.latin1() );
 	    that->d->mPixmaps[pos].convertFromImage(
 		    Resource::loadImage("UnknownDocument")
 			.smoothScale( size, size ) );
 	} else {
 	    that->d->mPixmaps[0].convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
 	    that->d->mPixmaps[1].convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
 	}
-	return that->d->mPixmaps[0];
+	return that->d->mPixmaps[pos];
     }
-    return mPixmap;
+    return d->mPixmaps[pos];
 }
 
 /*!
   Returns a small pixmap associated with the application.
 
   \sa bigPixmap() setIcon()
 */
 const QPixmap& AppLnk::pixmap() const
 {
     if ( d->mPixmaps[0].isNull() ) {
         return pixmap(AppLnkPrivate::Normal, smallSize );
     }
     return d->mPixmaps[0];
 }
 
 /*!
   Returns a large pixmap associated with the application.
 
   \sa pixmap() setIcon()
 */
 const QPixmap& AppLnk::bigPixmap() const
 {
     if ( d->mPixmaps[1].isNull() ) {
         return pixmap( AppLnkPrivate::Big, bigSize );
     }
     return mBigPixmap;
 }
 
 /*!
   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 ( 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;
 	} 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()
 */