From cfec78977f7a1ca96011e8f59c365b1b430b157a Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: May 25 2015 12:05:55 +0000
Subject: Merge branch 'master' into f22


---

diff --git a/.gitignore b/.gitignore
index facaf79..a71e34a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /cinnamon-desktop-2.6.0.tar.gz
 /cinnamon-desktop-2.6.1.tar.gz
 /cinnamon-desktop-2.6.2.tar.gz
+/cinnamon-desktop-2.6.3.tar.gz
diff --git a/cinnamon-desktop.spec b/cinnamon-desktop.spec
index 31c2f52..142b48a 100644
--- a/cinnamon-desktop.spec
+++ b/cinnamon-desktop.spec
@@ -6,7 +6,7 @@
 
 Summary: Shared code among cinnamon-session, nemo, etc
 Name:    cinnamon-desktop
-Version: 2.6.2
+Version: 2.6.3
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ add MIT
 URL:     http://cinnamon.linuxmint.com
@@ -113,6 +113,9 @@ fi
 %{_datadir}/gir-1.0/C*-3.0.gir
 
 %changelog
+* Mon May 25 2015 Leigh Scott <leigh123linux@googlemail.com> - 2.6.3-1
+- update to 2.6.3 release
+
 * Thu May 21 2015 Leigh Scott <leigh123linux@googlemail.com> - 2.6.2-1
 - update to 2.6.2 release
 
diff --git a/set_logind.patch b/set_logind.patch
index d3cc795..282eaf6 100644
--- a/set_logind.patch
+++ b/set_logind.patch
@@ -1,11 +1,23 @@
---- a/schemas/org.cinnamon.desktop.session.gschema.xml.in.in	2015-05-06 08:20:04.000000000 +0100
-+++ b/schemas/org.cinnamon.desktop.session.gschema.xml.in.in	2015-05-06 11:30:48.119691380 +0100
-@@ -12,7 +12,7 @@
+--- a/schemas/org.cinnamon.desktop.session.gschema.xml.in.in	2015-05-25 12:59:00.116282000 +0100
++++ b/schemas/org.cinnamon.desktop.session.gschema.xml.in.in	2015-05-25 12:59:47.617615918 +0100
+@@ -12,17 +12,17 @@
        "gnome" and "gnome-fallback".</description>
      </key>
-     <key name="use-systemd" type="b">
+     <key name="screensaver-uses-logind" type="b">
 -      <default>false</default>
 +      <default>true</default>
-       <_summary>Whether or not Cinnamon should use systemd/logind, or rely on upower/consolekit when appropriate</_summary>
-       <_description>If true, Cinnamon interacts with systemd/logind. If false, Cinnamon interacts with upower/consolekit when appropriate.</_description>
+       <_summary>Whether or not cinnamon-screensaver listens to logind to lock/unlock itself</_summary>
+       <_description>If true, it listens to logind. Otherwise it listens to consolekit.</_description>
+     </key>
+     <key name="session-manager-uses-logind" type="b">
+-      <default>false</default>
++      <default>true</default>
+       <_summary>Whether or not cinnamon-session uses logind to suspend/hibernate/shutdown/restart (usually from the shutdown dialog)</_summary>
+       <_description>If true, it uses logind. Otherwise it uses consolekit to shutdown/restart and upower to suspend/hibernate. It is only compatible with upower 0.9 and lower versions (not 0.99 or later).</_description>
+     </key>
+     <key name="settings-daemon-uses-logind" type="b">
+-      <default>false</default>
++      <default>true</default>
+       <_summary>Whether or not cinnamon-settings-daemon uses logind to suspend/hibernate/shutdown (either from media-keys or power-manager)</_summary>
+       <_description>If true, it uses logind for all three actions. Otherwise it uses consolekit for shutdown and upower for suspend/hibernate.</_description>
      </key>
diff --git a/sources b/sources
index 6ccef3b..33d687a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0aa91ac27a588e87e145af04a10ae72f  cinnamon-desktop-2.6.2.tar.gz
+155033b2c4fdc1c44ba152f73aa5d0b3  cinnamon-desktop-2.6.3.tar.gz