From a1ebad08d462e682554d39a9beabce125a374452 Mon Sep 17 00:00:00 2001
From: sandman <sandman>
Date: Sun, 06 Oct 2002 03:26:59 +0000
Subject: - support "Rotation" setting in .desktop applnk file

- changed properties dialog to make Rotation editable
- fixed a long-standing QPE bug:
  launcher expects AppLnk::file() to return QString::null for *all real*
  applnks (as opposed to doclnks) -- but AppLnk itself initializes this
  field to the name of the dir, where the applnk is stored.
  This is why qcop "QPE/System" "linkChanged(QString)" xyz.desktop cleared
  a whole launcher tab

I hope I didn't break anything with this change ;)
---
(limited to 'core/launcher')

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index fa46543..6e63fca 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -490,10 +490,9 @@ bool LauncherIconView::removeLink(const QString& linkfile)
     DocLnk dl(linkfile);
     while (item) {
 	l = item->appLnk();
-	if (  l->linkFileKnown() && l->linkFile() == linkfile
-		|| l->fileKnown() && (
-		    l->file() == linkfile
-		    || dl.isValid() && dl.file() == l->file() ) ) {
+	if ( ( l->linkFileKnown() && ( l->linkFile() == linkfile ))
+	  || ( l->fileKnown() && ( l->file() == linkfile ))
+	  || ( dl.fileKnown() && l->fileKnown() && ( dl.file() == l->file() )) ) {
 	    delete item;
 	    did = TRUE;
 	}
@@ -502,9 +501,9 @@ bool LauncherIconView::removeLink(const QString& linkfile)
     QListIterator<AppLnk> it(hidden);
     while ((l=it.current())) {
 	++it;
-	if ( l->linkFileKnown() && l->linkFile() == linkfile
-		|| l->file() == linkfile
-		|| dl.isValid() && dl.file() == l->file() ) {
+	if ( ( l->linkFileKnown() && ( l->linkFile() == linkfile ))
+	  || ( l->file() == linkfile )
+	  || ( dl.fileKnown() && ( dl.file() == l->file() )) ) {
 	    hidden.removeRef(l);
 	   did = TRUE;
 	}
--
cgit v0.9.0.2