| ... |
... |
@@ -17,7 +17,7 @@ from collections import namedtuple |
|
17
|
17
|
from datetime import timedelta
|
|
18
|
18
|
|
|
19
|
19
|
import nbxmpp
|
|
20
|
|
-from nbxmpp.util import is_error_result
|
|
|
20
|
+from nbxmpp.errors import StanzaError
|
|
21
|
21
|
from nbxmpp.namespaces import Namespace
|
|
22
|
22
|
from gi.repository import Gtk
|
|
23
|
23
|
from gi.repository import Gdk
|
| ... |
... |
@@ -28,7 +28,6 @@ from gajim.common import ged |
|
28
|
28
|
from gajim.common.helpers import open_uri
|
|
29
|
29
|
from gajim.common.i18n import _
|
|
30
|
30
|
|
|
31
|
|
-from gajim.gtk.util import ensure_not_destroyed
|
|
32
|
31
|
from gajim.gtk.util import get_builder
|
|
33
|
32
|
from gajim.gtk.util import EventHelper
|
|
34
|
33
|
from gajim.gtk.util import open_window
|
| ... |
... |
@@ -233,12 +232,14 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): |
|
233
|
232
|
'days': delta.days, 'hours': hours}
|
|
234
|
233
|
self._ui.server_uptime.set_text(uptime)
|
|
235
|
234
|
|
|
236
|
|
- @ensure_not_destroyed
|
|
237
|
|
- def _software_version_received(self, result):
|
|
238
|
|
- if is_error_result(result):
|
|
|
235
|
+ def _software_version_received(self, task):
|
|
|
236
|
+ try:
|
|
|
237
|
+ result = task.finish()
|
|
|
238
|
+ except StanzaError:
|
|
239
|
239
|
self.version = _('Unknown')
|
|
240
|
240
|
else:
|
|
241
|
241
|
self.version = '%s %s' % (result.name, result.version)
|
|
|
242
|
+
|
|
242
|
243
|
self._ui.server_software.set_text(self.version)
|
|
243
|
244
|
|
|
244
|
245
|
@staticmethod
|