Hello community,
here is the log from the commit of package cinnamon-screensaver for
openSUSE:Factory checked in at 2017-11-14 12:55:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-screensaver (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-screensaver"
Tue Nov 14 12:55:48 2017 rev:12 rq:540369 version:3.6.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-screensaver/cinnamon-screensaver.changes
2017-10-24 22:24:23.721560163 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-screensaver.new/cinnamon-screensaver.changes
2017-11-14 12:55:51.573938386 +0100
@@ -1,0 +2,23 @@
+Thu Nov 9 18:24:42 UTC 2017 - [email protected]
+
+- Update to version 3.6.1:
+ * Disable fade-in effects on idle.
+
+-------------------------------------------------------------------
+Sat Oct 28 19:57:36 UTC 2017 - [email protected]
+
+- Update to version 3.6.0:
+ * CsScreen: Fix hotplug/screen change detection and response,
+ other issues.
+ * logindClient.py: Produce a more helpful message when logind is
+ running, but we're unable to figure out a valid session id.
+ * manager/stage: Allow a second activation trigger to override a
+ previous one.
+ * manager.py: Force secondary activations to be immediate
+ (prevents flash).
+ * clock: Update for new wall clock API.
+ * keybindings: Remove the ability to take screenshots, restore
+ the ability to use computer power button.
+ * Update translations.
+
+-------------------------------------------------------------------
@@ -443 +465,0 @@
-
Old:
----
cinnamon-screensaver-3.4.3.tar.gz
New:
----
cinnamon-screensaver-3.6.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.g8vTZ9/_old 2017-11-14 12:55:52.357909710 +0100
+++ /var/tmp/diff_new_pack.g8vTZ9/_new 2017-11-14 12:55:52.361909563 +0100
@@ -17,7 +17,7 @@
Name: cinnamon-screensaver
-Version: 3.4.3
+Version: 3.6.1
Release: 0
Summary: Cinnamon screensaver and locker
License: GPL-2.0+
@@ -52,7 +52,7 @@
Requires: python3-gobject-cairo
Requires: python3-setproctitle
Requires: python3-xapp
-Recommends: cinnamon-translations
+Recommends: %{name}-lang
Recommends: xscreensaver-data
Suggests: xscreensaver-data-extra
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200
@@ -92,13 +92,17 @@
%post
/sbin/ldconfig
+%if 0%{?suse_version} <= 1320
%desktop_database_post
%icon_theme_cache_post
+%endif
%postun
/sbin/ldconfig
+%if 0%{?suse_version} <= 1320
%desktop_database_postun
%icon_theme_cache_postun
+%endif
%files
%doc AUTHORS COPYING* README debian/changelog
++++++ cinnamon-screensaver-3.4.3.tar.gz -> cinnamon-screensaver-3.6.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/cinnamon-screensaver.pot
new/cinnamon-screensaver-3.6.1/cinnamon-screensaver.pot
--- old/cinnamon-screensaver-3.4.3/cinnamon-screensaver.pot 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/cinnamon-screensaver.pot 2017-11-09
13:43:57.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-31 16:37+0000\n"
+"POT-Creation-Date: 2017-10-23 15:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -69,30 +69,26 @@
msgstr[0] ""
msgstr[1] ""
-#: src/clock.py:64
-msgid "%A, %B %e"
-msgstr ""
-
-#: src/passwordEntry.py:23 src/unlock.py:204
+#: src/passwordEntry.py:23 src/unlock.py:203
msgid "Please enter your password..."
msgstr ""
-#: src/unlock.py:91
+#: src/unlock.py:90
msgid "Unlock"
msgstr ""
-#: src/unlock.py:99
+#: src/unlock.py:98
msgid "Switch User"
msgstr ""
-#: src/unlock.py:182
+#: src/unlock.py:181
msgid "Incorrect password"
msgstr ""
-#: src/unlock.py:196
+#: src/unlock.py:195
msgid "Checking..."
msgstr ""
-#: src/unlock.py:242
+#: src/unlock.py:241
msgid "You have the Caps Lock key on."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/configure.ac
new/cinnamon-screensaver-3.6.1/configure.ac
--- old/cinnamon-screensaver-3.4.3/configure.ac 2017-10-12 13:33:13.000000000
+0200
+++ new/cinnamon-screensaver-3.6.1/configure.ac 2017-11-09 13:43:57.000000000
+0100
@@ -2,7 +2,7 @@
AC_PREREQ(2.60)
AC_INIT([cinnamon-screensaver],
- [3.4.3],
+ [3.6.1],
[https://github.com/linuxmint/cinnamon-screensaver/issues])
PKG_PROG_PKG_CONFIG([0.26])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/debian/changelog
new/cinnamon-screensaver-3.6.1/debian/changelog
--- old/cinnamon-screensaver-3.4.3/debian/changelog 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/debian/changelog 2017-11-09
13:43:57.000000000 +0100
@@ -1,15 +1,10 @@
-cinnamon-screensaver (3.4.3) sonya; urgency=medium
+cinnamon-screensaver (3.6.1) sylvia; urgency=medium
- [ Michael Webster ]
- * cs-notification-watcher.c: Ignore notifications that replace existing
ones, by checking if the 'replaces_id' field of the notification is non-zero.
- * cs-screen-x11.c: Use Gdk to get the screen size, the previous method
doesn't appear to update in time to have the new size, causing exposure to the
desktop in some cases, such as resizing host windows of virtual machines.
- * cs-screen-x11.c: GdkScreen width and height arrive already scaled for
hidpi.
- * logind/consolekit: Refresh screen and monitor info when coming back from
inactive (such as sleep.)
- * stage.py: Call gdk_flush to allow the server to catch up before getting
updated screen/monitor infos.
+ * Disable fade-in effects on idle
- -- Clement Lefebvre <[email protected]> Thu, 12 Oct 2017 12:32:35 +0100
+ -- Clement Lefebvre <[email protected]> Thu, 09 Nov 2017 12:43:32 +0000
-cinnamon-screensaver (3.4.2) sonya; urgency=medium
+cinnamon-screensaver (3.6.0) sylvia; urgency=medium
[ Michael Webster ]
* add an issue template
@@ -17,8 +12,24 @@
* logindClient.py: Produce a more helpful message when logind is running,
but we're unable to figure out a valid session id.
* manager/stage: Allow a second activation trigger to override a previous.
* manager.py: Force secondary activations to be immediate. (prevents flash)
+ * cs-notification-watcher.c: Ignore notifications that replace existing
ones, by checking if the 'replaces_id' field of the notification is non-zero.
+ * clock: Update for new wall clock API.
+ * debian/control: Update cinnamon-desktop dependency for new WallClock api.
+
+ [ Leigh Scott ]
+ * fix indent (#238)
+
+ [ Michael Webster ]
+ * cs-screen-x11.c: Use Gdk to get the screen size, the previous method
doesn't appear to update in time to have the new size, causing exposure to the
desktop in some cases, such as resizing host windows of virtual machines.
+ * cs-screen-x11.c: GdkScreen width and height arrive already scaled for
hidpi.
+ * logind/consolekit: Refresh screen and monitor info when coming back from
inactive (such as sleep.)
+ * stage.py: Call gdk_flush to allow the server to catch up before getting
updated screen/monitor infos.
+ * keybindings: remove ability to take screenshots, restore ability to use
computer power button.
+
+ [ Clement Lefebvre ]
+ * l10n: Update POT file
- -- Clement Lefebvre <[email protected]> Tue, 08 Aug 2017 13:11:48 +0200
+ -- Clement Lefebvre <[email protected]> Mon, 23 Oct 2017 15:50:38 +0100
cinnamon-screensaver (3.4.1) sonya; urgency=medium
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/debian/control
new/cinnamon-screensaver-3.6.1/debian/control
--- old/cinnamon-screensaver-3.4.3/debian/control 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/debian/control 2017-11-09
13:43:57.000000000 +0100
@@ -31,7 +31,7 @@
python3-gi-cairo,
python3-setproctitle,
python3-xapp (>= 1.0.1),
- gir1.2-cinnamondesktop-3.0,
+ gir1.2-cinnamondesktop-3.0 (>= 3.5.0),
gir1.2-gkbd-3.0,
gir1.2-glib-2.0,
gir1.2-gtk-3.0,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/albumArt.py
new/cinnamon-screensaver-3.6.1/src/albumArt.py
--- old/cinnamon-screensaver-3.4.3/src/albumArt.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/albumArt.py 2017-11-09
13:43:57.000000000 +0100
@@ -74,4 +74,3 @@
self.image.set_from_path(f.get_path())
elif f.get_uri_scheme() == "http":
self.image.set_from_file(f)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/cinnamon-screensaver-main.py
new/cinnamon-screensaver-3.6.1/src/cinnamon-screensaver-main.py
--- old/cinnamon-screensaver-3.4.3/src/cinnamon-screensaver-main.py
2017-10-12 13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/cinnamon-screensaver-main.py
2017-11-09 13:43:57.000000000 +0100
@@ -118,6 +118,3 @@
setproctitle.setproctitle('cinnamon-screensaver')
main = Main()
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/clock.py
new/cinnamon-screensaver-3.6.1/src/clock.py
--- old/cinnamon-screensaver-3.4.3/src/clock.py 2017-10-12 13:33:13.000000000
+0200
+++ new/cinnamon-screensaver-3.6.1/src/clock.py 2017-11-09 13:43:57.000000000
+0100
@@ -1,6 +1,6 @@
#!/usr/bin/python3
-from gi.repository import CinnamonDesktop, CDesktopEnums, GLib, Gtk, Gio
+from gi.repository import CinnamonDesktop, GLib, Gtk, Gio
from util import utils, trackers, settings
from baseWindow import BaseWindow
@@ -31,10 +31,10 @@
self.label.show()
self.add(self.label)
- self.clock_tracker = CinnamonDesktop.WallClock()
- self.set_clock_interval()
+ self.clock = CinnamonDesktop.WallClock()
+ self.set_clock_format()
- trackers.con_tracker_get().connect(self.clock_tracker,
+ trackers.con_tracker_get().connect(self.clock,
"notify::clock",
self.on_clock_changed)
@@ -51,26 +51,26 @@
self.update_clock()
- def set_clock_interval(self):
- interval = CDesktopEnums.ClockInterval.SETTING
+ def set_clock_format(self):
+ date_format = ""
+ time_format = ""
if settings.get_use_custom_format():
date_format = settings.get_custom_date_format()
time_format = settings.get_custom_time_format()
+ else:
+ date_format = self.clock.get_default_date_format()
+ time_format = self.clock.get_default_time_format()
- use_seconds = False
-
- for token in ("%S", "%c", "%T", "%X"):
- if token in date_format or token in time_format:
- use_seconds = True
- break
-
- if use_seconds:
- interval = CDesktopEnums.ClockInterval.SECOND
- else:
- interval = CDesktopEnums.ClockInterval.MINUTE
+ # %l is 12-hr hours, but it adds a space to 0-9, which looks bad
here.
+ # The '-' modifier tells the GDateTime formatter not to pad the
value.
+ time_format = time_format.replace('%l', '%-l')
+
+ time_format = ('<b><span font_desc=\"%s\"
foreground=\"#FFFFFF\">%s</span></b>\n' + \
+ '<b><span font_desc=\"%s\"
foreground=\"#FFFFFF\">%s</span></b>') \
+ % (settings.get_time_font(), time_format,
settings.get_date_font(), date_format)
- self.clock_tracker.set_update_interval(interval)
+ self.clock.set_format_string(time_format)
def on_clock_changed(self, clock, pspec):
self.update_clock()
@@ -78,32 +78,6 @@
def on_tz_changed(self, monitor, file, other, event):
self.update_clock()
- def get_clock_string(self):
- date_value = ""
- time_value = ""
-
- now = GLib.DateTime.new_now_local()
-
- if not settings.get_use_custom_format():
- if settings.get_clock_should_show_date():
- date_value = now.format(_("%A, %B %e"))
- else:
- date_value = ""
-
- if settings.get_clock_should_use_24h():
- time_value = now.format("%H:%M").lstrip()
- else:
- time_value = now.format("%l:%M %p").lstrip()
- else:
- date_value = now.format(settings.get_custom_date_format())
- time_value = now.format(settings.get_custom_time_format())
-
- clock_string = ('<b><span font_desc=\"%s\"
foreground=\"#FFFFFF\">%s</span></b>\n' +\
- '<b><span font_desc=\"%s\"
foreground=\"#FFFFFF\">%s</span></b>')\
- % (settings.get_time_font(), time_value,
settings.get_date_font(), date_value)
-
- return clock_string
-
def update_clock(self):
default_message = GLib.markup_escape_text
(settings.get_default_away_message(), -1)
font_message = settings.get_message_font()
@@ -112,10 +86,10 @@
user_name = utils.get_user_display_name()
markup = ('%s\n\n<b><span font_desc=\"Ubuntu 14\"
foreground=\"#CCCCCC\">%s</span></b>' +\
'\n<b><span font_desc=\"Ubuntu 10\"
foreground=\"#ACACAC\"> ~ %s</span></b>') %\
- (self.get_clock_string(), self.away_message, user_name)
+ (self.clock.get_clock(), self.away_message, user_name)
else:
markup = '%s\n\n<b><span font_desc=\"%s\"
foreground=\"#CCCCCC\">%s</span></b>' %\
- (self.get_clock_string(), font_message, default_message)
+ (self.clock.get_clock(), font_message, default_message)
self.label.set_markup(markup)
self.label.set_line_wrap(True)
@@ -126,7 +100,7 @@
self.update_clock()
def on_destroy(self, data=None):
- trackers.con_tracker_get().disconnect(self.clock_tracker,
+ trackers.con_tracker_get().disconnect(self.clock,
"notify::clock",
self.on_clock_changed)
@@ -138,6 +112,5 @@
"destroy",
self.on_destroy)
- self.clock_tracker = None
+ self.clock = None
self.tz_monitor = None
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/constants.py
new/cinnamon-screensaver-3.6.1/src/constants.py
--- old/cinnamon-screensaver-3.4.3/src/constants.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/constants.py 2017-11-09
13:43:57.000000000 +0100
@@ -8,10 +8,11 @@
STAGE_DESPAWN_TRANSITION = 250
# Time in ms to fade the stage in when triggered by session idle
-STAGE_IDLE_SPAWN_TRANSITION = 10 * 1000
-# Time in ms to despawn the stage when it is interrupted during an
-# idle fade in.
-STAGE_IDLE_CANCEL_SPAWN_TRANSITION = 125
+# Set to 0, see
https://github.com/linuxmint/cinnamon-screensaver/issues/219#issuecomment-342679518
+STAGE_IDLE_SPAWN_TRANSITION = 0
+# Time in ms to despawn the stage when it is interrupted during an idle fade
in.
+# Set to 0, see
https://github.com/linuxmint/cinnamon-screensaver/issues/219#issuecomment-342679518
+STAGE_IDLE_CANCEL_SPAWN_TRANSITION = 0
# Time in ms to wait before releasing the keyboard and mouse grabs
# after an idle-activation is canceled.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/dbusdepot/accountsServiceClient.py
new/cinnamon-screensaver-3.6.1/src/dbusdepot/accountsServiceClient.py
--- old/cinnamon-screensaver-3.4.3/src/dbusdepot/accountsServiceClient.py
2017-10-12 13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/dbusdepot/accountsServiceClient.py
2017-11-09 13:43:57.000000000 +0100
@@ -42,4 +42,4 @@
face_path = path
break
- return face_path
\ No newline at end of file
+ return face_path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/dbusdepot/cinnamonClient.py
new/cinnamon-screensaver-3.6.1/src/dbusdepot/cinnamonClient.py
--- old/cinnamon-screensaver-3.4.3/src/dbusdepot/cinnamonClient.py
2017-10-12 13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/dbusdepot/cinnamonClient.py
2017-11-09 13:43:57.000000000 +0100
@@ -29,4 +29,4 @@
self.proxy.set_property("expo-active", False)
def on_failure(self, *args):
- print("Failed to connect to Cinnamon - screensaver will not activate
when expo or overview modes are active.")
\ No newline at end of file
+ print("Failed to connect to Cinnamon - screensaver will not activate
when expo or overview modes are active.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/dbusdepot/consoleKitClient.py
new/cinnamon-screensaver-3.6.1/src/dbusdepot/consoleKitClient.py
--- old/cinnamon-screensaver-3.4.3/src/dbusdepot/consoleKitClient.py
2017-10-12 13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/dbusdepot/consoleKitClient.py
2017-11-09 13:43:57.000000000 +0100
@@ -63,4 +63,4 @@
self.emit("active")
def on_failure(self, *args):
- self.emit("startup-status", False)
\ No newline at end of file
+ self.emit("startup-status", False)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/dbusdepot/keybindingHandlerClient.py
new/cinnamon-screensaver-3.6.1/src/dbusdepot/keybindingHandlerClient.py
--- old/cinnamon-screensaver-3.4.3/src/dbusdepot/keybindingHandlerClient.py
2017-10-12 13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/dbusdepot/keybindingHandlerClient.py
2017-11-09 13:43:57.000000000 +0100
@@ -27,4 +27,4 @@
self.proxy.call_handle_keybinding(mk_type, None, None)
def on_failure(self, *args):
- print("Failed to connect to the keybinding handler - media key
shortcuts will not work.")
\ No newline at end of file
+ print("Failed to connect to the keybinding handler - media key
shortcuts will not work.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/dbusdepot/mediaPlayerWatcher.py
new/cinnamon-screensaver-3.6.1/src/dbusdepot/mediaPlayerWatcher.py
--- old/cinnamon-screensaver-3.4.3/src/dbusdepot/mediaPlayerWatcher.py
2017-10-12 13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/dbusdepot/mediaPlayerWatcher.py
2017-11-09 13:43:57.000000000 +0100
@@ -279,4 +279,4 @@
split = fullname.split(".")
ret.append(split[len(split) - 1].lower())
- return ret
\ No newline at end of file
+ return ret
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/dbusdepot/screensaverClient.py
new/cinnamon-screensaver-3.6.1/src/dbusdepot/screensaverClient.py
--- old/cinnamon-screensaver-3.4.3/src/dbusdepot/screensaverClient.py
2017-10-12 13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/dbusdepot/screensaverClient.py
2017-11-09 13:43:57.000000000 +0100
@@ -18,13 +18,12 @@
def __init__(self):
super(ScreenSaverClient, self).__init__(Gio.BusType.SESSION,
- CScreensaver.ScreenSaverProxy,
- c.SS_SERVICE,
- c.SS_PATH)
+ CScreensaver.ScreenSaverProxy,
+ c.SS_SERVICE,
+ c.SS_PATH)
def on_client_setup_complete(self):
self.emit("client-ready", True)
def on_failure(self, *args):
self.emit("client-ready", False)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/dbusdepot/sessionClient.py
new/cinnamon-screensaver-3.6.1/src/dbusdepot/sessionClient.py
--- old/cinnamon-screensaver-3.4.3/src/dbusdepot/sessionClient.py
2017-10-12 13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/dbusdepot/sessionClient.py
2017-11-09 13:43:57.000000000 +0100
@@ -35,4 +35,4 @@
self.emit("idle-changed", self.idle)
def on_failure(self, *args):
- print("Failed to connect to session manager - idle detection will not
work.")
\ No newline at end of file
+ print("Failed to connect to session manager - idle detection will not
work.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/dbusdepot/uPowerClient.py
new/cinnamon-screensaver-3.6.1/src/dbusdepot/uPowerClient.py
--- old/cinnamon-screensaver-3.4.3/src/dbusdepot/uPowerClient.py
2017-10-12 13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/dbusdepot/uPowerClient.py
2017-11-09 13:43:57.000000000 +0100
@@ -182,4 +182,4 @@
return self.plugged_in and all_batteries_full
def on_failure(self, *args):
- print("Failed to establish a connection with UPower - the battery
indicator will be disabled.")
\ No newline at end of file
+ print("Failed to establish a connection with UPower - the battery
indicator will be disabled.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/floating.py
new/cinnamon-screensaver-3.6.1/src/floating.py
--- old/cinnamon-screensaver-3.4.3/src/floating.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/floating.py 2017-11-09
13:43:57.000000000 +0100
@@ -71,5 +71,3 @@
trackers.timer_tracker_get().cancel(str(self) + "align-timeout")
return False
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/infoPanel.py
new/cinnamon-screensaver-3.6.1/src/infoPanel.py
--- old/cinnamon-screensaver-3.4.3/src/infoPanel.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/infoPanel.py 2017-11-09
13:43:57.000000000 +0100
@@ -79,7 +79,7 @@
if self.show_notifications:
do_reveal = True
-
+
if do_reveal:
self.power_widget.set_visible(self.show_power)
self.notification_widget.set_visible(self.show_notifications)
@@ -96,4 +96,3 @@
trackers.con_tracker_get().disconnect(self,
"notify::child-revealed",
self.after_unreveal)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/manager.py
new/cinnamon-screensaver-3.6.1/src/manager.py
--- old/cinnamon-screensaver-3.4.3/src/manager.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/manager.py 2017-11-09
13:43:57.000000000 +0100
@@ -15,7 +15,7 @@
class ScreensaverManager(GObject.Object):
"""
- The ScreensaverManager is the central point where most major decision are
made,
+ The ScreensaverManager is the central point where most major decision are
made,
and where ScreensaverService requests are acted upon.
"""
__gsignals__ = {
@@ -39,7 +39,7 @@
self.session_client = singletons.SessionClient
trackers.con_tracker_get().connect(self.session_client,
- "idle-changed",
+ "idle-changed",
self.on_session_idle_changed)
self.cinnamon_client = singletons.CinnamonClient
@@ -77,7 +77,7 @@
def set_active(self, active, immediate=False, msg=None):
"""
Activates or deactivates the screensaver. Activation involves:
- - sending a request to Cinnamon to exit Overview or Expo -
+ - sending a request to Cinnamon to exit Overview or Expo -
this could prevent a successful screen grab and keep the
screensaver from activating.
- grabbing the keyboard and mouse.
@@ -356,18 +356,3 @@
self.grab_helper.release()
return False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/monitorView.py
new/cinnamon-screensaver-3.6.1/src/monitorView.py
--- old/cinnamon-screensaver-3.4.3/src/monitorView.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/monitorView.py 2017-11-09
13:43:57.000000000 +0100
@@ -28,7 +28,7 @@
def set_initial_image(self, image):
"""
- Creates and sets the initial background image to use in
+ Creates and sets the initial background image to use in
the WallpaperStack.
"""
self.current = image
@@ -254,4 +254,3 @@
match = re.match('^\s*WINDOW ID=(\d+)\s*$', output)
if match:
self.socket.add_id(int(match.group(1)))
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/playerControl.py
new/cinnamon-screensaver-3.6.1/src/playerControl.py
--- old/cinnamon-screensaver-3.4.3/src/playerControl.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/playerControl.py 2017-11-09
13:43:57.000000000 +0100
@@ -174,4 +174,4 @@
"""
Checked by the AudioPanel, whether or not this widget should be
displayed.
"""
- return self.player != None
\ No newline at end of file
+ return self.player != None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/singletons.py
new/cinnamon-screensaver-3.6.1/src/singletons.py
--- old/cinnamon-screensaver-3.4.3/src/singletons.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/singletons.py 2017-11-09
13:43:57.000000000 +0100
@@ -10,7 +10,7 @@
# business to the various dbus address is performed asynchronously from within
each client.
# The following clients can fail to establish with their respective dbus
interfaces without
# competely breaking the program (or at least that's what we're after) - it
just means that
-# depending on what fails, you may end up without keyboard shortcut support,
or a battery
+# depending on what fails, you may end up without keyboard shortcut support,
or a battery
# widget, etc...
from dbusdepot.cinnamonClient import CinnamonClient as _CinnamonClient
from dbusdepot.sessionClient import SessionClient as _SessionClient
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/stage.py
new/cinnamon-screensaver-3.6.1/src/stage.py
--- old/cinnamon-screensaver-3.4.3/src/stage.py 2017-10-12 13:33:13.000000000
+0200
+++ new/cinnamon-screensaver-3.6.1/src/stage.py 2017-11-09 13:43:57.000000000
+0100
@@ -49,7 +49,7 @@
self.get_style_context().add_class("csstage")
trackers.con_tracker_get().connect(singletons.Backgrounds,
- "changed",
+ "changed",
self.on_bg_changed)
self.destroying = False
@@ -415,8 +415,8 @@
image = Gtk.Image()
singletons.Backgrounds.create_and_set_gtk_image (image,
- monitor.rect.width,
- monitor.rect.height)
+
monitor.rect.width,
+
monitor.rect.height)
monitor.set_next_wallpaper_image(image)
@@ -658,7 +658,7 @@
"""
Hide the unlock widget (and others) if the unlock has been canceled
- This process is in three steps for aesthetic reasons -
+ This process is in three steps for aesthetic reasons -
a) Unreveal all widgets (begin fading them out)
b) Switch over MonitorViews from wallpaper to plug-ins if needed.
c) Re-reveal the InfoPanel if applicable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/unlock.py
new/cinnamon-screensaver-3.6.1/src/unlock.py
--- old/cinnamon-screensaver-3.4.3/src/unlock.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/unlock.py 2017-11-09
13:43:57.000000000 +0100
@@ -314,4 +314,3 @@
Updates the name label to the current real_name.
"""
self.realname_label.set_text(self.real_name)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/util/focusNavigator.py
new/cinnamon-screensaver-3.6.1/src/util/focusNavigator.py
--- old/cinnamon-screensaver-3.4.3/src/util/focusNavigator.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/util/focusNavigator.py 2017-11-09
13:43:57.000000000 +0100
@@ -97,4 +97,3 @@
return None
return widgets[focus_index]
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/util/keybindings.py
new/cinnamon-screensaver-3.6.1/src/util/keybindings.py
--- old/cinnamon-screensaver-3.4.3/src/util/keybindings.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/util/keybindings.py 2017-11-09
13:43:57.000000000 +0100
@@ -16,7 +16,6 @@
MK.VOLUME_DOWN_QUIET,
MK.MIC_MUTE,
MK.EJECT,
- MK.SCREENSHOT,
MK.PLAY,
MK.PAUSE,
MK.STOP,
@@ -29,6 +28,7 @@
MK.TOUCHPAD,
MK.TOUCHPAD_ON,
MK.TOUCHPAD_OFF,
+ MK.SHUTDOWN,
MK.SCREEN_BRIGHTNESS_UP,
MK.SCREEN_BRIGHTNESS_DOWN,
MK.KEYBOARD_BRIGHTNESS_UP,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/util/settings.py
new/cinnamon-screensaver-3.6.1/src/util/settings.py
--- old/cinnamon-screensaver-3.4.3/src/util/settings.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/util/settings.py 2017-11-09
13:43:57.000000000 +0100
@@ -37,8 +37,6 @@
# Interface settings - the same logic applies here as above - we don't
# need to listen to changes to these.
if_settings = Gio.Settings(schema_id="org.cinnamon.desktop.interface")
-CLOCK_SHOW_DATE_KEY = "clock-show-date"
-CLOCK_USE_24H_KEY = "clock-use-24h"
KBD_LAYOUT_SHOW_FLAGS = "keyboard-layout-show-flags"
KBD_LAYOUT_USE_CAPS = "keyboard-layout-use-upper"
KBD_LAYOUT_PREFER_VARIANT = "keyboard-layout-prefer-variant-names"
@@ -108,12 +106,6 @@
return _check_string(time_font)
-def get_clock_should_show_date():
- return if_settings.get_boolean(CLOCK_SHOW_DATE_KEY)
-
-def get_clock_should_use_24h():
- return if_settings.get_boolean(CLOCK_USE_24H_KEY)
-
def get_show_flags():
return if_settings.get_boolean(KBD_LAYOUT_SHOW_FLAGS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/util/trackers.py
new/cinnamon-screensaver-3.6.1/src/util/trackers.py
--- old/cinnamon-screensaver-3.4.3/src/util/trackers.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/util/trackers.py 2017-11-09
13:43:57.000000000 +0100
@@ -219,5 +219,3 @@
def con_tracker_get():
global connection_tracker
return connection_tracker
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/util/utils.py
new/cinnamon-screensaver-3.6.1/src/util/utils.py
--- old/cinnamon-screensaver-3.4.3/src/util/utils.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/util/utils.py 2017-11-09
13:43:57.000000000 +0100
@@ -136,9 +136,9 @@
return None
try_path = os.path.join(config.pkgdatadir,
- "screensavers",
- name,
- "main")
+ "screensavers",
+ name,
+ "main")
if not os.path.exists(try_path):
try_path = os.path.join(GLib.get_user_data_dir(),
@@ -152,14 +152,14 @@
return try_path
def CLAMP(value, low, high):
- return max(low, min(value, high))
+ return max(low, min(value, high))
def have_gtk_version(version_string):
[major, minor, micro] = version_string.split(".", 3)
return Gtk.get_major_version() >= eval(major) and \
- Gtk.get_minor_version() >= eval(minor) and \
- Gtk.get_micro_version() >= eval(micro)
+ Gtk.get_minor_version() >= eval(minor) and \
+ Gtk.get_micro_version() >= eval(micro)
def clear_clipboards(widget):
clipboard = widget.get_clipboard(Gdk.SELECTION_PRIMARY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-3.4.3/src/volumeControl.py
new/cinnamon-screensaver-3.6.1/src/volumeControl.py
--- old/cinnamon-screensaver-3.4.3/src/volumeControl.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/volumeControl.py 2017-11-09
13:43:57.000000000 +0100
@@ -98,8 +98,8 @@
self.volume_slider.set_value(volume)
trackers.con_tracker_get().handler_unblock(self.volume_slider,
- "value-changed",
- self.on_volume_slider_changed)
+ "value-changed",
+
self.on_volume_slider_changed)
def on_volume_slider_changed(self, range, data=None):
value = self.volume_slider.get_value()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/widgets/powerWidget.py
new/cinnamon-screensaver-3.6.1/src/widgets/powerWidget.py
--- old/cinnamon-screensaver-3.4.3/src/widgets/powerWidget.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/widgets/powerWidget.py 2017-11-09
13:43:57.000000000 +0100
@@ -88,5 +88,3 @@
def should_show(self):
return not self.power_client.full_and_on_ac_or_no_batteries()
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-3.4.3/src/widgets/volumeSlider.py
new/cinnamon-screensaver-3.6.1/src/widgets/volumeSlider.py
--- old/cinnamon-screensaver-3.4.3/src/widgets/volumeSlider.py 2017-10-12
13:33:13.000000000 +0200
+++ new/cinnamon-screensaver-3.6.1/src/widgets/volumeSlider.py 2017-11-09
13:43:57.000000000 +0100
@@ -84,4 +84,3 @@
cr.restore()
return True
-
