diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 15:32:38 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 15:32:38 -0300 |
| commit | 995dab37c4558447073ea6cb2c6ef7b89849912c (patch) | |
| tree | 1b37cc72fc3a796bfa2856c7f710f978304b3a84 /extra/kdebase-workspace | |
| parent | 20604a1579dcd51b5a46fc7d09cf4b1535219446 (diff) | |
| parent | 1a1b748f1738b1989a834d75b1623be21bf9bab5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-datetime-format-iso8601/PKGBUILD
extra/kde-agent/PKGBUILD
extra/labplot/PKGBUILD
Diffstat (limited to 'extra/kdebase-workspace')
| -rw-r--r-- | extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch b/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch deleted file mode 100644 index fec667663..000000000 --- a/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 3f1dd3b94ab2b56abb43a51b7b78a9cd162325d0 -Author: Aaron Seigo <aseigo@kde.org> -Date: Fri May 6 22:51:50 2011 +0200 - - get rid of duplicate connect - - patch contributed by Luc Menut - BUG:262614 - REVIEW:101284 - -diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp b/plasma/generic/containmentactions/applauncher/launch.cpp -index cbc7175..bef53e5 100644 ---- a/plasma/generic/containmentactions/applauncher/launch.cpp -+++ b/plasma/generic/containmentactions/applauncher/launch.cpp -@@ -36,7 +36,6 @@ AppLauncher::AppLauncher(QObject *parent, const QVariantList &args) - { - m_menu = new KMenu(); - connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*))); -- connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*))); - - m_action->setMenu(m_menu); - } |