changeset 10a73406c098 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=10a73406c098 description: remove imort dbus.glib to remove a warning
diffstat:
plugins/dbus_plugin/plugin.py | 1 - src/common/dbus_support.py | 3 ++- src/common/location_listener.py | 1 - src/common/zeroconf/zeroconf_avahi.py | 1 - src/music_track_listener.py | 1 - src/network_manager_listener.py | 1 - src/notify.py | 1 - src/remote_control.py | 1 - src/upower_listener.py | 3 +-- 9 files changed, 3 insertions(+), 10 deletions(-)
diffs (108 lines):
diff -r 7af7ec865838 -r 10a73406c098 plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Sat Aug 11 22:34:44 2012 +0200 +++ b/plugins/dbus_plugin/plugin.py Sat Aug 11 22:46:39 2012 +0200 @@ -48,7 +48,6 @@ SERVICE = 'org.gajim.dbusplugin'
import dbus.service - import dbus.glib # type mapping
# in most cases it is a utf-8 string diff -r 7af7ec865838 -r 10a73406c098 src/common/dbus_support.py --- a/src/common/dbus_support.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/common/dbus_support.py Sat Aug 11 22:46:39 2012 +0200 @@ -33,7 +33,8 @@
try: import dbus - import dbus.glib + from dbus.mainloop.glib import DBusGMainLoop + DBusGMainLoop(set_as_default=True) except ImportError: supported = False if not os.name == 'nt': # only say that to non Windows users diff -r 7af7ec865838 -r 10a73406c098 src/common/location_listener.py --- a/src/common/location_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/common/location_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -25,7 +25,6 @@ from common import dbus_support if dbus_support.supported: import dbus - import dbus.glib
class LocationListener: _instance = None diff -r 7af7ec865838 -r 10a73406c098 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/common/zeroconf/zeroconf_avahi.py Sat Aug 11 22:46:39 2012 +0200 @@ -21,7 +21,6 @@ log = logging.getLogger('gajim.c.z.zeroconf_avahi')
try: - import dbus.glib import dbus.exceptions except ImportError, e: pass diff -r 7af7ec865838 -r 10a73406c098 src/music_track_listener.py --- a/src/music_track_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/music_track_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -31,7 +31,6 @@ from common import dbus_support if dbus_support.supported: import dbus - import dbus.glib
class MusicTrackInfo(object): __slots__ = ['title', 'album', 'artist', 'duration', 'track_number', diff -r 7af7ec865838 -r 10a73406c098 src/network_manager_listener.py --- a/src/network_manager_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/network_manager_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -64,7 +64,6 @@
if dbus_support.supported: import dbus - import dbus.glib
try: from common.dbus_support import system_bus diff -r 7af7ec865838 -r 10a73406c098 src/notify.py --- a/src/notify.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/notify.py Sat Aug 11 22:46:39 2012 +0200 @@ -41,7 +41,6 @@ from common import dbus_support if dbus_support.supported: import dbus - import dbus.glib
USER_HAS_PYNOTIFY = True # user has pynotify module diff -r 7af7ec865838 -r 10a73406c098 src/remote_control.py --- a/src/remote_control.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/remote_control.py Sat Aug 11 22:46:39 2012 +0200 @@ -43,7 +43,6 @@ import dbus if dbus_support: import dbus.service - import dbus.glib
INTERFACE = 'org.gajim.dbus.RemoteInterface' OBJ_PATH = '/org/gajim/dbus/RemoteObject' diff -r 7af7ec865838 -r 10a73406c098 src/upower_listener.py --- a/src/upower_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/upower_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -34,7 +34,6 @@
if dbus_support.supported: import dbus - import dbus.glib
try: from common.dbus_support import system_bus @@ -47,4 +46,4 @@ '/org/freedesktop/UPower') supported = True except Exception: - pass \ No newline at end of file + pass