1 files changed, 17 insertions, 10 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index ed39720..e8741a2 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -209,16 +209,14 @@ public:
     int compare(const AppLnk* a, const AppLnk* b)
     {
         switch (sortmeth) {
         case Name:
             return a->name().compare(b->name());
         case Date: {
-            QFileInfo fa(a->linkFile());
-            if ( !fa.exists() ) fa.setFile(a->file());
-            QFileInfo fb(b->linkFile());
-            if ( !fb.exists() ) fb.setFile(b->file());
+            QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
+            QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
             return fa.lastModified().secsTo(fb.lastModified());
         }
         case Type:
             return a->type().compare(b->type());
         }
         return 0;
@@ -359,43 +357,52 @@ void LauncherIconView::hideOrShowItems(bool resort)
     hidden.setAutoDelete(TRUE);
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
         links.append(item->takeAppLnk());
         item = (LauncherItem*)item->nextItem();
     }
+    bool oldAutoArrange = autoArrange();
+    setAutoArrange( FALSE );
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
     while ((l=it.current())) {
         addItem(l,FALSE);
         ++it;
     }
     if ( resort )
         sort();
+    setAutoArrange( oldAutoArrange );
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
+    AppLnk* l;
+    bool did = FALSE;
+    DocLnk dl(linkfile);
     while (item) {
-        if ( item->appLnk()->linkFile() == linkfile ) {
+        l = item->appLnk();
+        if (  l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile
+                || dl.isValid() && dl.file() == l->file() ) {
             delete item;
-            return TRUE;
+            did = TRUE;
         }
         item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
-    AppLnk* l;
     while ((l=it.current())) {
         ++it;
-        if ( l->linkFile() == linkfile ) {
+        if ( l->linkFileKnown() && l->linkFile() == linkfile
+                || l->file() == linkfile
+                || dl.isValid() && dl.file() == l->file() ) {
             hidden.removeRef(l);
-            return TRUE;
+           did = TRUE;
         }
     }
-    return FALSE;
+    return did;
 }
 
 LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     : QVBox( parent, name, fl )
 {
     icons = new LauncherIconView( this );