fix bug 0000591

AppLnk does not need to reload all labels but it needs to reload
the names for the ids in mCat

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
@@ -80,25 +80,29 @@ public:
         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;
 
@@ -397,24 +401,25 @@ AppLnk::AppLnk( const QString &file )
                     }
                     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;