1 files changed, 6 insertions, 1 deletions

diff --git a/library/applnk.cpp b/library/applnk.cpp
index 5763c62..35822dd 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -60,65 +60,69 @@ static QString safeFileName(const QString& n)
 static bool prepareDirectories(const QString& lf)
 {
     if ( !QFile::exists(lf) ) {
 	// May need to create directories
 	QFileInfo fi(lf);
 	if ( system(("mkdir -p "+fi.dirPath(TRUE))) )
 	    return FALSE;
     }
     return TRUE;
 }
 
 class AppLnkPrivate
 {
 public:
     /* the size of the Pixmap */
     enum Size {Normal = 0, Big };
     AppLnkPrivate() {
         /* we want one normal and one big item */
 
         QPixmap pix;
         mPixmaps.insert(0, pix );
         mPixmaps.insert(1,  pix);
     }
 
     QStringList mCatList; // always correct
     QArray<int> mCat; // cached value; correct if not empty
     QMap<int,  QPixmap> mPixmaps;
 
     void updateCatListFromArray()
     {
 	Categories cat( 0 );
 	cat.load( categoryFileName() );
-	mCatList = cat.labels("Document View",mCat);
+	// we need to update the names for the mCat... to mCatList
+        mCatList.clear();
+        for (uint i = 0; i < mCat.count(); i++ )
+            mCatList << cat.label("Document View", mCat[i] );
+
     }
 
     void setCatArrayDirty()
     {
 	mCat.resize(0);
     }
 
     void ensureCatArray()
     {
 	if ( mCat.count() > 0 || mCatList.count()==0 )
 	    return;
 
 	Categories cat( 0 );
 	cat.load( categoryFileName() );
 	mCat.resize( mCatList.count() );
 	int i;
 	QStringList::ConstIterator it;
 	for ( i = 0, it = mCatList.begin(); it != mCatList.end();
 	      ++it, i++ ) {
 
 	    bool number;
 	    int id = (*it).toInt( &number );
 	    if ( !number ) {
 		id = cat.id( "Document View", *it );
 		if ( id == 0 )
 		    id = cat.addCategory( "Document View", *it );
 	    }
 	    mCat[i] = id;
 	}
     }
 };
 
@@ -377,64 +381,65 @@ AppLnk::AppLnk( const QString &file )
 		    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 ( this == &copy ) return *this;
     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?