ubuntu_integration. fix detecting 'python-xdg' module

This commit is contained in:
Denis Fomin
2012-08-12 23:15:45 +04:00
parent 08468fb412
commit e0a84d89f1

View File

@@ -31,11 +31,6 @@ try:
HAS_INDICATE = True
except ImportError:
HAS_INDICATE = False
try:
from xdg.BaseDirectory import load_data_paths
HAS_PYXDG = True
except ImportError:
HAS_PYXDG = False
class UbuntuIntegrationPlugin(GajimPlugin):
@@ -64,10 +59,13 @@ class UbuntuIntegrationPlugin(GajimPlugin):
# {(account, jid): (indicator, [event, ...]), ...}
self.events = {}
try:
from xdg.BaseDirectory import load_data_paths
except ImportError:
raise GajimPluginException("python-xdg is missing!")
if not HAS_INDICATE:
raise GajimPluginException("python-indicate is missing!")
if not HAS_PYXDG:
raise GajimPluginException("python-xdg is missing!")
self.server = indicate.indicate_server_ref_default()
self.server.set_type("message.im")