From be32d9afe6fb4b165ee91adc10c277e4619bb8c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= <git@apitzsch.eu>
Date: Sat, 9 Dec 2017 00:34:17 +0100
Subject: [PATCH] Remove upower_listener
the 'Sleeping' signal has been removed from UPower about four years ago
https://cgit.freedesktop.org/upower/commit/src/org.freedesktop.UPower.xml?id=1ee642e705a63f5ad56a6b55e4bf5c4a64c959b8
---
gajim/features_window.py | 9 --------
gajim/gui_interface.py | 1 -
gajim/upower_listener.py | 47 ----------------------------------------
3 files changed, 57 deletions(-)
delete mode 100644 gajim/upower_listener.py
diff --git a/gajim/features_window.py b/gajim/features_window.py
index 5fa363eeb6..2f0466962d 100644
--- a/gajim/features_window.py
+++ b/gajim/features_window.py
@@ -85,10 +85,6 @@ class FeaturesWindow:
_('Ability to request your router to forward port for file transfer.'),
_('Requires gir1.2-gupnpigd-1.0.'),
_('Feature not available under Windows.')),
- _('UPower'): (self.upower_available,
- _('Ability to disconnect properly just before suspending the machine.'),
- _('Requires upower and python-dbus.'),
- _('Feature not available under Windows.')),
}
# name, supported
@@ -186,8 +182,3 @@ class FeaturesWindow:
def gupnp_igd_available(self):
return app.HAVE_UPNP_IGD
- def upower_available(self):
- if os.name == 'nt':
- return False
- from gajim import upower_listener
- return upower_listener.supported
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 4ef992bb37..4ab1c84d94 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -2853,7 +2853,6 @@ class Interface:
self.remote_ctrl = None
if dbus_support.supported:
- from gajim import upower_listener
from gajim import logind_listener
# Handle gnome screensaver
diff --git a/gajim/upower_listener.py b/gajim/upower_listener.py
deleted file mode 100644
index 544dca5356..0000000000
--- a/gajim/upower_listener.py
+++ /dev/null
@@ -1,47 +0,0 @@
-## src/upower_listener.py
-##
-## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org>
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-
-
-supported = False
-
-from gajim.common import dbus_support
-from gajim.common import app
-
-def on_suspend(*args, **kwargs):
- for name, conn in app.connections.items():
- if app.account_is_connected(name):
- conn.old_show = app.SHOW_LIST[conn.connected]
- st = conn.status
- conn.change_status('offline', _('Machine going to sleep'))
- conn.status = st
- conn.time_to_reconnect = 5
-
-if dbus_support.supported:
- try:
- from gajim.common.dbus_support import system_bus
- bus = system_bus.bus()
- if 'org.freedesktop.UPower' in bus.list_names():
- up_object = bus.get_object('org.freedesktop.UPower',
- '/org/freedesktop/UPower')
- bus.add_signal_receiver(on_suspend, 'Sleeping',
- 'org.freedesktop.UPower', 'org.freedesktop.UPower',
- '/org/freedesktop/UPower')
- supported = True
- except Exception:
- pass
--
GitLab