copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix imports

Browse source
This commit is contained in:
Philipp Hörist 2018-10-26 01:31:49 +02:00
parent cfd24b6d6c
commit b80afa7179
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gajim/gui_interface.py
View file

@ -56,7 +56,9 @@ except Exception:
from gajim.common import app from gajim.common import app
from gajim.common import events from gajim.common import events
from gajim.common import dbus from gajim.common.dbus import screensaver
from gajim.common.dbus import location
from gajim.common.dbus import music_track
from gajim import gtkgui_helpers from gajim import gtkgui_helpers
from gajim import gui_menu_builder from gajim import gui_menu_builder
@ -1114,7 +1116,7 @@ class Interface:
# enable location listener # enable location listener
if (pep_supported and app.is_installed('GEOCLUE') and if (pep_supported and app.is_installed('GEOCLUE') and
app.config.get_per('accounts', account, 'publish_location')): app.config.get_per('accounts', account, 'publish_location')):
dbus.location.enable() location.enable()
@staticmethod @staticmethod
def show_httpupload_progress(file): def show_httpupload_progress(file):
@ -2079,14 +2081,14 @@ class Interface:
def enable_music_listener(self): def enable_music_listener(self):
listener = dbus.music_track.MusicTrackListener.get() listener = music_track.MusicTrackListener.get()
if not self.music_track_changed_signal: if not self.music_track_changed_signal:
self.music_track_changed_signal = listener.connect( self.music_track_changed_signal = listener.connect(
'music-track-changed', self.music_track_changed) 'music-track-changed', self.music_track_changed)
listener.start() listener.start()
def disable_music_listener(self): def disable_music_listener(self):
listener = dbus.music_track.MusicTrackListener.get() listener = music_track.MusicTrackListener.get()
listener.disconnect(self.music_track_changed_signal) listener.disconnect(self.music_track_changed_signal)
self.music_track_changed_signal = None self.music_track_changed_signal = None
listener.stop() listener.stop()
@ -2722,7 +2724,7 @@ class Interface:
# Handle screensaver # Handle screensaver
if sys.platform == 'linux': if sys.platform == 'linux':
from gajim import logind_listener # pylint: disable=unused-variable from gajim import logind_listener # pylint: disable=unused-variable
dbus.screensaver.enable() screensaver.enable()
self.show_vcard_when_connect = [] self.show_vcard_when_connect = []

6
gajim/roster_window.py
View file

@ -61,8 +61,8 @@ from gajim.common.exceptions import GajimGeneralException
from gajim.common import i18n from gajim.common import i18n
from gajim.common.i18n import _ from gajim.common.i18n import _
from gajim.common.const import PEPEventType, AvatarSize, StyleAttr from gajim.common.const import PEPEventType, AvatarSize, StyleAttr
if app.is_installed('GEOCLUE'): from gajim.common.dbus import location
from gajim.common import dbus
from gajim.common import ged from gajim.common import ged
from gajim.message_window import MessageWindowMgr from gajim.message_window import MessageWindowMgr
@ -3659,7 +3659,7 @@ class RosterWindow:
active = widget.get_active() active = widget.get_active()
app.config.set_per('accounts', account, 'publish_location', active) app.config.set_per('accounts', account, 'publish_location', active)
if active: if active:
dbus.location.enable() location.enable()
else: else:
app.connections[account].get_module('UserLocation').send(None) app.connections[account].get_module('UserLocation').send(None)