don't load remote control if dbus is 0.23.x
and python is 2.4
This commit is contained in:
parent
973631a2c9
commit
71231fb864
|
@ -21,6 +21,7 @@
|
||||||
import gobject
|
import gobject
|
||||||
import gtk
|
import gtk
|
||||||
import os
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
from common import gajim
|
from common import gajim
|
||||||
from time import time
|
from time import time
|
||||||
|
@ -54,6 +55,10 @@ class Remote:
|
||||||
print _('D-Bus python bindings are missing in this computer')
|
print _('D-Bus python bindings are missing in this computer')
|
||||||
print _('D-Bus capabilities of Gajim cannot be used')
|
print _('D-Bus capabilities of Gajim cannot be used')
|
||||||
raise DbusNotSupported()
|
raise DbusNotSupported()
|
||||||
|
# dbus 0.23 leads to segfault with threads_init()
|
||||||
|
if sys.version[:4] >= '2.4' and _version[1] < 30:
|
||||||
|
raise DbusNotSupported()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
session_bus = dbus.SessionBus()
|
session_bus = dbus.SessionBus()
|
||||||
except:
|
except:
|
||||||
|
|
Loading…
Reference in New Issue