diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index 516942dde71b1c245f31739bfab4ccf2ea0970e8..ca915da7fa4e7b23f0850863d9b96dcdac650e91 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -44,13 +44,10 @@ METACONTACTS_ARRIVED = 'metacontacts_arrived' PRIVACY_ARRIVED = 'privacy_arrived' HAS_IDLE = True try: - import common.idle as idle # when we launch gajim from sources + import idle except: - try: - import idle # when Gajim is installed - except: - gajim.log.debug(_('Unable to load idle module')) - HAS_IDLE = False + gajim.log.debug(_('Unable to load idle module')) + HAS_IDLE = False class ConnectionBytestream: def __init__(self): diff --git a/src/common/sleepy.py b/src/common/sleepy.py index 5d31e90b37a9a9ce5d43344b18be9739b2e19dea..a0ce13ae7204c0ac8aa55418860df873dcfb0599 100644 --- a/src/common/sleepy.py +++ b/src/common/sleepy.py @@ -33,13 +33,10 @@ STATE_AWAKE = 'awake' SUPPORTED = True try: - import common.idle as idle # when we launch gajim from sources + import idle except: - try: - import idle # when Gajim is installed - except: - gajim.log.debug('Unable to load idle module') - SUPPORTED = False + gajim.log.debug('Unable to load idle module') + SUPPORTED = False class Sleepy: diff --git a/src/common/zeroconf/connection_handlers_zeroconf.py b/src/common/zeroconf/connection_handlers_zeroconf.py index 2023c7bd09078cc6477e2e8aed41db6e33da60c4..238de3ee8ce82b58b575080e05cdc54335d21a57 100644 --- a/src/common/zeroconf/connection_handlers_zeroconf.py +++ b/src/common/zeroconf/connection_handlers_zeroconf.py @@ -42,13 +42,10 @@ VCARD_ARRIVED = 'vcard_arrived' AGENT_REMOVED = 'agent_removed' HAS_IDLE = True try: - import common.idle as idle # when we launch gajim from sources + import idle except: - try: - import idle # when Gajim is installed - except: - gajim.log.debug(_('Unable to load idle module')) - HAS_IDLE = False + gajim.log.debug(_('Unable to load idle module')) + HAS_IDLE = False class ConnectionBytestream: