[cinnamon/f19] Patch so screen lock uses gnome-screensaver

leigh123linux leigh123linux at fedoraproject.org
Thu Jun 6 10:30:14 UTC 2013 

commit 8543ef31bc622e5f811c927acd3fa7dcb1660a5c
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Jun 6 11:30:01 2013 +0100

    Patch so screen lock uses gnome-screensaver
    
    - add gnome-screensaver autostart files
    - add patch to remove obex file transfer

 bluetooth_obex_transfer.patch               |   25 +++++++++++++++++++
 cinnamon-1.6.0_favourite-apps-firefox.patch |   35 ---------------------------
 cinnamon-screensaver.desktop                |   15 +++++++++++
 cinnamon.spec                               |   23 ++++++++++++++++-
 cinnamon2d-screensaver.desktop              |   15 +++++++++++
 fedora_icon.patch                           |   20 ---------------
 screensaver.patch                           |   14 ++++++++++
 7 files changed, 90 insertions(+), 57 deletions(-)
---
diff --git a/bluetooth_obex_transfer.patch b/bluetooth_obex_transfer.patch
new file mode 100644
index 0000000..0e632c4
--- /dev/null
+++ b/bluetooth_obex_transfer.patch
@@ -0,0 +1,25 @@
+--- a/files/usr/share/cinnamon/applets/bluetooth at cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/bluetooth at cinnamon.org/applet.js
+@@ -455,22 +455,6 @@ MyApplet.prototype = {
+                 this._applet.send_to_address(device.bdaddr, device.alias);
+             }));
+         }
+-        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
+-            item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
+-                this._applet.browse_address(device.bdaddr, event.get_time(),
+-                    Lang.bind(this, function(applet, result) {
+-                        try {
+-                            applet.browse_address_finish(result);
+-                        } catch (e) {
+-                            this._ensureSource();
+-                            this._source.notify(new MessageTray.Notification(this._source,
+-                                 _("Bluetooth"),
+-                                 _("Error browsing device"),
+-                                 { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
+-                        }
+-                    }));
+-            }));
+-        }
+ 
+         switch (device.type) {
+         case GnomeBluetoothApplet.Type.KEYBOARD:
diff --git a/cinnamon-screensaver.desktop b/cinnamon-screensaver.desktop
new file mode 100644
index 0000000..ddc9686
--- /dev/null
+++ b/cinnamon-screensaver.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Name=Cinnamon Screensaver
+Comment=Launch screensaver and locker program
+Icon=preferences-desktop-screensaver
+Exec=gnome-screensaver
+OnlyShowIn=GNOME;
+AutostartCondition=GNOME3 if-session cinnamon
+NoDisplay=true
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-screensaver
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.6.0
diff --git a/cinnamon.spec b/cinnamon.spec
index 7a42065..f01e02f 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,6 +1,6 @@
 Name:           cinnamon
 Version:        1.9.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -9,11 +9,15 @@ Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/%{name}
 #wget https://github.com/linuxmint/Cinnamon/archive/%{version}.tar.gz -O %{name}-%{version}.tar.gz
 
 Source1:        cinnamon-fedora.gschema.override
+Source2:        cinnamon-screensaver.desktop
+Source3:        cinnamon2d-screensaver.desktop
 
 Patch0:         gnome-3.8-compat.patch
 Patch1:         background.patch
 Patch2:         idle-dim.patch
 Patch3:         keyboard_applet.patch
+Patch4:         screensaver.patch
+Patch5:         bluetooth_obex_transfer.patch
 
 
 %global clutter_version 1.12.2
@@ -102,6 +106,8 @@ The emphasis is put on making users feel at home and providing
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -120,7 +126,11 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 # Remove .la file
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/cinnamon/libcinnamon.la
 
-install -D -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
+install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
+
+# Add autostart files for gnome-screensaver
+mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/
+install -pm 0644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
 
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon2d.desktop
@@ -149,6 +159,7 @@ fi
 %doc COPYING README
 %{_bindir}/*
 %{_sysconfdir}/xdg/menus/*
+%{_sysconfdir}/xdg/autostart/*
 %{_datadir}/applications/*
 %{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
 %{_datadir}/desktop-directories/*
@@ -164,6 +175,14 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jun 06 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-4
+- Patch so screen lock uses gnome-screensaver
+- add gnome-screensaver autostart files
+- add patch to remove obex file transfer
+
+* Thu Jun 06 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-3
+- bump version
+
 * Tue Jun 04 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-2
 - add cinnamon-fedora.gschema.override file
 
diff --git a/cinnamon2d-screensaver.desktop b/cinnamon2d-screensaver.desktop
new file mode 100644
index 0000000..aed9557
--- /dev/null
+++ b/cinnamon2d-screensaver.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Name=Cinnamon2d Screensaver
+Comment=Launch screensaver and locker program
+Icon=preferences-desktop-screensaver
+Exec=gnome-screensaver
+OnlyShowIn=GNOME;
+AutostartCondition=GNOME3 if-session cinnamon2d
+NoDisplay=true
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-screensaver
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.6.0
diff --git a/screensaver.patch b/screensaver.patch
new file mode 100644
index 0000000..4ddbd75
--- /dev/null
+++ b/screensaver.patch
@@ -0,0 +1,14 @@
+--- a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
++++ b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
+@@ -57,9 +57,9 @@ class MainWindow:
+     def lock_screen(self, data):
+         message = self.entry.get_text()
+         if (message != ""):
+-            os.system("cinnamon-screensaver-command --lock --away-message \"%s\" &" % self.entry.get_text())
++            os.system("gnome-screensaver-command --lock --away-message \"%s\" &" % self.entry.get_text())
+         else:
+-            os.system("cinnamon-screensaver-command --lock &")
++            os.system("gnome-screensaver-command --lock &")
+         gtk.main_quit()
+    
+ if __name__ == "__main__":

More information about the scm-commits mailing list