[cinnamon/f19: 13/14] Revert "fix the screensaver tab in cinnamon-settings"

[leigh123linux]

commit 0cc485710cdcb7c045ffade7515edd6b30eb52e7
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jun 12 19:40:53 2013 +0100

    Revert "fix the screensaver tab in cinnamon-settings"
    
    This reverts commit 7604f4efd4a7794f31863d5f73eaa1c7c6922d7c.

 cinnamon.spec     |    5 +----
 screensaver.patch |   22 ----------------------
 2 files changed, 1 insertions(+), 26 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 7f4a4e1..cf0db88 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,6 +1,6 @@
 Name:           cinnamon
 Version:        1.9.1
-Release:        10%{?dist}
+Release:        9%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -208,9 +208,6 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Wed Jun 12 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-10
-- fix the screensaver tab in cinnamon-settings
-
 * Sun Jun 09 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-9
 - add requires gnome-screensaver
 
diff --git a/screensaver.patch b/screensaver.patch
index a0623ce..4ddbd75 100644
--- a/screensaver.patch
+++ b/screensaver.patch
@@ -12,25 +12,3 @@
          gtk.main_quit()
     
  if __name__ == "__main__":    
---- a/files/usr/lib/cinnamon-settings/modules/cs_screensaver.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_screensaver.py
-@@ -5,15 +5,15 @@ from SettingsWidgets import *
- 
- class Module:
-     def __init__(self, content_box):
--        keywords = _("screensaver, brightness, lock, password, away, message")
-+        keywords = _("screensaver, brightness, lock, password, user, switching")
-         advanced = False
-         sidePage = SidePage(_("Screensaver & Lock Settings"), "screensaver.svg", keywords, advanced, content_box)
-         self.sidePage = sidePage
-         self.name = "screensaver"
-         self.category = "prefs"
--        if os.path.exists("/usr/bin/cinnamon-screensaver-command"):
--            sidePage.add_widget(GSettingsCheckButton(_("Ask for an away message when locking the screen from the menu"), "org.cinnamon.screensaver", "ask-for-away-message", None))
--            sidePage.add_widget(GSettingsEntry(_("Default away message"), "org.cinnamon.screensaver", "default-message", None))
-+        if os.path.exists("/usr/bin/gnome-screensaver-command"):
-+            self.sidePage.add_widget(GSettingsCheckButton(_("Ask for password when unlocking"), "org.gnome.desktop.screensaver", "lock-enabled", None))
-+            self.sidePage.add_widget(GSettingsCheckButton(_("Disable user switching"), "org.gnome.desktop.screensaver", "user-switch-enabled", None))
- 
-         widget = content_box.c_manager.get_c_widget("screen")
-         if widget is not None: