changeset d5d67440d14b in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=d5d67440d14b
description: remove imort dbus.glib to remove a warning
diffstat:
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 +--
8 files changed, 3 insertions(+), 9 deletions(-)
diffs (97 lines):
diff -r f0700c90c1dd -r d5d67440d14b src/common/dbus_support.py
--- a/src/common/dbus_support.py Sat Aug 11 14:59:05 2012 +0400
+++ 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 f0700c90c1dd -r d5d67440d14b src/common/location_listener.py
--- a/src/common/location_listener.py Sat Aug 11 14:59:05 2012 +0400
+++ 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 f0700c90c1dd -r d5d67440d14b src/common/zeroconf/zeroconf_avahi.py
--- a/src/common/zeroconf/zeroconf_avahi.py Sat Aug 11 14:59:05 2012 +0400
+++ 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 f0700c90c1dd -r d5d67440d14b src/music_track_listener.py
--- a/src/music_track_listener.py Sat Aug 11 14:59:05 2012 +0400
+++ 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 f0700c90c1dd -r d5d67440d14b src/network_manager_listener.py
--- a/src/network_manager_listener.py Sat Aug 11 14:59:05 2012 +0400
+++ 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 f0700c90c1dd -r d5d67440d14b src/notify.py
--- a/src/notify.py Sat Aug 11 14:59:05 2012 +0400
+++ 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 f0700c90c1dd -r d5d67440d14b src/remote_control.py
--- a/src/remote_control.py Sat Aug 11 14:59:05 2012 +0400
+++ 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 f0700c90c1dd -r d5d67440d14b src/upower_listener.py
--- a/src/upower_listener.py Sat Aug 11 14:59:05 2012 +0400
+++ 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
_______________________________________________
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
