rdieter pushed to plasma-desktop (f22). "default to folder containment (#1220862)"

[notifications at fedoraproject.org]

From 232230999e9501ec5705c6a67c38e0bfd9a693d9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 21 May 2015 08:14:52 -0500
Subject: default to folder containment (#1220862)


diff --git a/plasma-desktop-fedora_layout.patch b/plasma-desktop-fedora_layout.patch
new file mode 100644
index 0000000..cb7efd8
--- /dev/null
+++ b/plasma-desktop-fedora_layout.patch
@@ -0,0 +1,12 @@
+diff -up plasma-desktop-5.3.0/desktoppackage/contents/layout.js.fedora_layout plasma-desktop-5.3.0/desktoppackage/contents/layout.js
+--- plasma-desktop-5.3.0/desktoppackage/contents/layout.js.fedora_layout	2015-04-23 05:02:33.000000000 -0500
++++ plasma-desktop-5.3.0/desktoppackage/contents/layout.js	2015-05-21 08:10:39.185880487 -0500
+@@ -2,7 +2,7 @@
+ loadTemplate("org.kde.plasma.desktop.defaultPanel")
+ 
+ for (var i = 0; i < screenCount; ++i) {
+-    var id = createActivity("Desktop");
++    var id = createActivity("Fedora Desktop", "org.kde.plasma.folder");
+     var desktopsArray = desktopsForActivity(id);
+     print(desktopsArray.length);
+     for( var j = 0; j < desktopsArray.length; j++) {
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 585dcd6..325cc32 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -1,6 +1,6 @@
 Name:           plasma-desktop
 Version:        5.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plasma Desktop shell
 
 License:        GPLv2+ and (GPLv2 or GPLv3)
@@ -19,6 +19,8 @@ Source0:        http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{ve
 Patch100: plasma-desktop-5.2.1-default_favorites.patch
 # FIXME: make upstreamable, fix dup'd PREFIX KAUTH_HELPER_INSTALL_DIR when using absolute paths
 Patch101: plasma-desktop-fix-fontinst-service-path.patch
+# Default to Folder containment (rather than Desktop)
+Patch102: plasma-desktop-fedora_layout.patch
 
 ## upstream patches
 
@@ -255,6 +257,9 @@ fi
 
 
 %changelog
+* Thu May 21 2015 Rex Dieter <rdieter at fedoraproject.org> 5.3.0-6
+- default to folder containment (#1220862)
+
 * Fri May 08 2015 Rex Dieter <rdieter at fedoraproject.org> 5.3.0-5
 - Recommends: kmenuedit
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/plasma-desktop.git/commit/?h=f22&id=232230999e9501ec5705c6a67c38e0bfd9a693d9