[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] libs/taskmanager: Don't associate an app to a launcher if both have valid but differ
From:       Craig Drummond <craig () kde ! org>
Date:       2012-08-27 19:33:57
Message-ID: 20120827193357.A8B23A60C8 () git ! kde ! org
[Download RAW message or body]

Git commit 50fded0b644c21b0dea8746e23643dbac23d3143 by Craig Drummond.
Committed on 27/08/2012 at 21:33.
Pushed by craig into branch 'master'.

Don't associate an app to a launcher if both have valid but different launcher URLs.
BUG: 303162

M  +9    -5    libs/taskmanager/launcheritem.cpp

http://commits.kde.org/kde-workspace/50fded0b644c21b0dea8746e23643dbac23d3143

diff --git a/libs/taskmanager/launcheritem.cpp b/libs/taskmanager/launcheritem.cpp
index 9e03fda..12cb24b 100644
--- a/libs/taskmanager/launcheritem.cpp
+++ b/libs/taskmanager/launcheritem.cpp
@@ -88,11 +88,15 @@ bool LauncherItem::associateItemIfMatches(AbstractGroupableItem *item)
 
     KUrl itemUrl = item->launcherUrl();
 
-    if (!itemUrl.isEmpty() && launcherUrl() == itemUrl) {
-        d->associates.insert(item);
-        connect(item, SIGNAL(destroyed(QObject*)), this, SLOT(associateDestroyed(QObject*)));
-        emit associationChanged();
-        return true;
+    if (!itemUrl.isEmpty()) {
+        if (launcherUrl() == itemUrl) {
+            d->associates.insert(item);
+            connect(item, SIGNAL(destroyed(QObject*)), this, SLOT(associateDestroyed(QObject*)));
+            emit associationChanged();
+            return true;
+        } else if (!launcherUrl().isEmpty()) {
+            return false;
+        }
     }
 
     QString name;
[prev in list] [next in list] [prev in thread] [next in thread]