Merge pull request #586 from raelgc/585-keep-online-status

Keep online status (#585)
raelgc · Jun 15, 2017 · b8306e2 · b8306e2
2 parents bbbe01e + 0b2228d
commit b8306e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/scudcloud/resources/scudcloud.js b/scudcloud/resources/scudcloud.js
@@ -131,7 +131,7 @@ ScudCloud = {
 		TS.client.ui.file_pasted_sig.dispatch(data, TS.model.shift_key_pressed);
 	},
 	sendTickle: function(){
-		return TS.ms.sendTickle();
+		return TS.client.ui.maybeTickleMS();
 	},
 	preferences: function(){
 		return TS.ui.prefs_dialog.start();

diff --git a/scudcloud/scudcloud.py b/scudcloud/scudcloud.py
@@ -91,8 +91,12 @@ def __init__(self, debug = False, minimized = None, urgent_hint = None, settings
             sessionBus = dbus.SessionBus()
             # Ubuntu 12.04 and other distros
             sessionBus.add_match_string("type='signal',interface='org.gnome.ScreenSaver'")
-            # Ubuntu 14.04 and above
+            # Ubuntu 14.04
             sessionBus.add_match_string("type='signal',interface='com.ubuntu.Upstart0_6'")
+            # Ubuntu 16.04 and KDE
+            sessionBus.add_match_string("type='signal',interface='org.freedesktop.ScreenSaver'")
+            # Cinnamon
+            essionBus.add_match_string("type='signal',interface='org.cinnamon.ScreenSaver'")
             sessionBus.add_message_filter(self.screenListener)
             self.tickler.timeout.connect(self.sendTickle)
         # If dbus is not present, tickler timer will act like a blocker to not send tickle too often