[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=73bcc5d

The following commit has been merged in the master branch:
commit 73bcc5d320edf8b9be42673a88a7dcb754615d11
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue Apr 10 11:23:04 2012 +0200

    Support the FD.o desktop file actions in the icon tasks applet.
    
    The X-Ayatana specification has been deprecated.
---
 debian/changelog                                   |  8 ++
 .../kubuntu_support_new_fdo_desktop_actions.diff   | 97 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 106 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7e83c8a..6b767c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kdeplasma-addons (4:4.8.2-0ubuntu2) precise; urgency=low
+
+  * Support the FD.o desktop file actions in the icon tasks applet.
+    The X-Ayatana specification has been deprecated.
+    - Add kubuntu_support_new_fdo_desktop_actions.diff
+
+ -- Felix Geyer <debfx at ubuntu.com>  Tue, 10 Apr 2012 10:58:17 +0200
+
 kdeplasma-addons (4:4.8.2-0ubuntu1) precise; urgency=low
 
   * New upstream release
diff --git a/debian/patches/kubuntu_support_new_fdo_desktop_actions.diff b/debian/patches/kubuntu_support_new_fdo_desktop_actions.diff
new file mode 100644
index 0000000..733bc7b
--- /dev/null
+++ b/debian/patches/kubuntu_support_new_fdo_desktop_actions.diff
@@ -0,0 +1,97 @@
+From 934743adaf468e377ff858be03c605a570391e3f Mon Sep 17 00:00:00 2001
+From: Felix Geyer <debfx-kde at fobos.de>
+Date: Sun, 1 Apr 2012 19:19:59 +0200
+Subject: [PATCH] Support new FD.o desktop actions.
+Forwarded: https://git.reviewboard.kde.org/r/104462/
+
+---
+ applets/icontasks/unityitem.cpp |   40 ++++++++++++++++++++++++--------------
+ applets/icontasks/unityitem.h   |    3 ++
+ 2 files changed, 28 insertions(+), 15 deletions(-)
+
+diff --git a/applets/icontasks/unityitem.cpp b/applets/icontasks/unityitem.cpp
+index f653e4f..f952a45 100644
+--- a/applets/icontasks/unityitem.cpp
++++ b/applets/icontasks/unityitem.cpp
+@@ -28,7 +28,6 @@
+ #include <QtGui/QAction>
+ #include <QtGui/QMenu>
+ #include <KDE/KDesktopFile>
+-#include <KDE/KConfigGroup>
+ #include <KDE/KRun>
+ #include <KDE/KIcon>
+ #include <dbusmenuimporter.h>
+@@ -215,24 +214,35 @@ void UnityItem::readStaticMenu()
+ 
+             KDesktopFile df(m_desktopFile);
+             KConfigGroup de(&df, "Desktop Entry");
+-            QStringList  shortCuts = de.readEntry("X-Ayatana-Desktop-Shortcuts", QString()).split(';');
+-
+-            foreach (QString shortcut, shortCuts) {
+-                KConfigGroup grp(&df, shortcut + " Shortcut Group");
+-                QString name = grp.readEntry("Name", QString());
+-                QString exec = grp.readEntry("Exec", QString());
+-
+-                if (!name.isEmpty() && !exec.isEmpty()) {
+-                    QString icon = grp.readEntry("Icon", QString()); // ???
+-                    QAction *action = icon.isEmpty() ? new QAction(name, this) : new QAction(KIcon(icon), name, this);
+-                    action->setData(exec);
+-                    m_staticMenu.append(action);
+-                    connect(action, SIGNAL(triggered()), this, SLOT(menuActivated()));
+-                }
++
++            QStringList shortCutsFdo = de.readEntry("Actions", QString()).split(';');
++
++            foreach (QString shortcut, shortCutsFdo) {
++                parseDesktopAction(KConfigGroup(&df, "Desktop Action " + shortcut));
++            }
++
++            QStringList shortCutsAyatana = de.readEntry("X-Ayatana-Desktop-Shortcuts", QString()).split(';');
++
++            foreach (QString shortcut, shortCutsAyatana) {
++                parseDesktopAction(KConfigGroup(&df, shortcut + " Shortcut Group"));
+             }
+         }
+         m_staticDirty = false;
+     }
+ }
+ 
++void UnityItem::parseDesktopAction(const KConfigGroup& grp)
++{
++    QString name = grp.readEntry("Name", QString());
++    QString exec = grp.readEntry("Exec", QString());
++
++    if (!name.isEmpty() && !exec.isEmpty()) {
++        QString icon = grp.readEntry("Icon", QString()); // ???
++        QAction *action = icon.isEmpty() ? new QAction(name, this) : new QAction(KIcon(icon), name, this);
++        action->setData(exec);
++        m_staticMenu.append(action);
++        connect(action, SIGNAL(triggered()), this, SLOT(menuActivated()));
++    }
++}
++
+ #include "unityitem.moc"
+diff --git a/applets/icontasks/unityitem.h b/applets/icontasks/unityitem.h
+index 7e00501..3a76b43 100644
+--- a/applets/icontasks/unityitem.h
++++ b/applets/icontasks/unityitem.h
+@@ -31,6 +31,8 @@
+ #include <QtCore/QVariant>
+ #include <QtCore/QString>
+ 
++#include <KDE/KConfigGroup>
++
+ class AbstractTaskItem;
+ class QTimer;
+ class QAction;
+@@ -72,6 +74,7 @@ public Q_SLOTS:
+ 
+ private:
+     void readStaticMenu();
++    void parseDesktopAction(const KConfigGroup& grp);
+ 
+ private:
+     QString m_id;
+-- 
+1.7.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9149ff5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_support_new_fdo_desktop_actions.diff

-- 
KDE Plasma Addons module packaging