| ... |
... |
@@ -56,7 +56,9 @@ except Exception: |
|
56
|
56
|
|
|
57
|
57
|
from gajim.common import app
|
|
58
|
58
|
from gajim.common import events
|
|
59
|
|
-from gajim.common import dbus
|
|
|
59
|
+from gajim.common.dbus import screensaver
|
|
|
60
|
+from gajim.common.dbus import location
|
|
|
61
|
+from gajim.common.dbus import music_track
|
|
60
|
62
|
|
|
61
|
63
|
from gajim import gtkgui_helpers
|
|
62
|
64
|
from gajim import gui_menu_builder
|
| ... |
... |
@@ -1114,7 +1116,7 @@ class Interface: |
|
1114
|
1116
|
# enable location listener
|
|
1115
|
1117
|
if (pep_supported and app.is_installed('GEOCLUE') and
|
|
1116
|
1118
|
app.config.get_per('accounts', account, 'publish_location')):
|
|
1117
|
|
- dbus.location.enable()
|
|
|
1119
|
+ location.enable()
|
|
1118
|
1120
|
|
|
1119
|
1121
|
@staticmethod
|
|
1120
|
1122
|
def show_httpupload_progress(file):
|
| ... |
... |
@@ -2079,14 +2081,14 @@ class Interface: |
|
2079
|
2081
|
|
|
2080
|
2082
|
|
|
2081
|
2083
|
def enable_music_listener(self):
|
|
2082
|
|
- listener = dbus.music_track.MusicTrackListener.get()
|
|
|
2084
|
+ listener = music_track.MusicTrackListener.get()
|
|
2083
|
2085
|
if not self.music_track_changed_signal:
|
|
2084
|
2086
|
self.music_track_changed_signal = listener.connect(
|
|
2085
|
2087
|
'music-track-changed', self.music_track_changed)
|
|
2086
|
2088
|
listener.start()
|
|
2087
|
2089
|
|
|
2088
|
2090
|
def disable_music_listener(self):
|
|
2089
|
|
- listener = dbus.music_track.MusicTrackListener.get()
|
|
|
2091
|
+ listener = music_track.MusicTrackListener.get()
|
|
2090
|
2092
|
listener.disconnect(self.music_track_changed_signal)
|
|
2091
|
2093
|
self.music_track_changed_signal = None
|
|
2092
|
2094
|
listener.stop()
|
| ... |
... |
@@ -2722,7 +2724,7 @@ class Interface: |
|
2722
|
2724
|
# Handle screensaver
|
|
2723
|
2725
|
if sys.platform == 'linux':
|
|
2724
|
2726
|
from gajim import logind_listener # pylint: disable=unused-variable
|
|
2725
|
|
- dbus.screensaver.enable()
|
|
|
2727
|
+ screensaver.enable()
|
|
2726
|
2728
|
|
|
2727
|
2729
|
self.show_vcard_when_connect = []
|
|
2728
|
2730
|
|