[SCM] plasma-desktop packaging branch, master, updated. 3a008c7c6b669f2fd617ac895f1dc03658edceef

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=d267676

The following commit has been merged in the master branch:
commit d2676767bcde8b7c00113db3afc786ab0c77f920
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Oct 9 10:50:56 2014 +0200

    Add upstream_default-kickoff-applications.diff LP: #1362747 "No web browser in app menu"
---
 debian/changelog                                   |  6 ++--
 debian/patches/series                              |  1 +
 .../upstream_default-kickoff-applications.diff     | 32 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84b804e..5f002c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,13 @@ plasma-desktop (4:5.0.95-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Jonathan Riddell ]
   * New upstream beta release
+  * Add upstream_default-kickoff-applications.diff LP: #1362747
+    "No web browser in app menu"
 
   [ Scarlett Clark ]
-  * Fix copyright file (remove spaces) to appease lintian. 
+  * Fix copyright file (remove spaces) to appease lintian.
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 01 Oct 2014 15:28:57 +0200
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 09 Oct 2014 10:47:45 +0200
 
 plasma-desktop (4:5.0.2-0ubuntu1) utopic; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f118cab
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_default-kickoff-applications.diff
diff --git a/debian/patches/upstream_default-kickoff-applications.diff b/debian/patches/upstream_default-kickoff-applications.diff
new file mode 100644
index 0000000..32d4c07
--- /dev/null
+++ b/debian/patches/upstream_default-kickoff-applications.diff
@@ -0,0 +1,32 @@
+Author: Jonathan Riddell <jr at jriddell.org>
+Date:   Thu Oct 9 10:35:49 2014 +0200
+Description: Update default applications in kickoff
+    instead of defaulting to konqueror find the first browser from a list
+    change konsole to ktp-contactlist, we want to appeal to non geeks
+    change kmail for kontact, we provide a lovely PIM suite so we should show it by default
+Forwarded: https://git.reviewboard.kde.org/r/120538/
+
+diff --git a/applets/kickoff/core/favoritesmodel.cpp b/applets/kickoff/core/favoritesmodel.cpp
+index e26cf80..e1d3a71 100644
+--- a/applets/kickoff/core/favoritesmodel.cpp
++++ b/applets/kickoff/core/favoritesmodel.cpp
+@@ -109,7 +109,18 @@ public:
+     static QList<QString> defaultFavorites()
+     {
+         QList<QString> applications;
+-        applications << "konqbrowser" << "KMail2" << "systemsettings" << "dolphin" << "org.kde.konsole" << "org.kde.kwrite";
++
++        QList<QString> browsers;
++        browsers << "konqbrowser" << "rekonq" << "firefox" << "chromium-browser" << "google-chrome";
++        foreach (const QString& browser, browsers) {
++            KService::Ptr service = KService::serviceByStorageId(browser + ".desktop");
++            if (service) {
++                applications << browser;
++                break;
++            }
++        }
++
++        applications << "kontact" << "systemsettings" << "dolphin" << "ktp-contactlist" << "kwrite";
+ 
+         QList<QString> desktopFiles;
+ 

-- 
plasma-desktop packaging