Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
42e1f2bc
by lovetox at 2020-10-14T18:23:20+02:00
1 changed file:
Changes:
| ... | ... | @@ -32,7 +32,7 @@ from gi.repository import Gtk |
| 32 | 32 |
from gi.repository import GLib
|
| 33 | 33 |
from gi.repository import Gdk
|
| 34 | 34 |
from nbxmpp.structs import AnnotationNote
|
| 35 |
-from nbxmpp.util import is_error_result
|
|
| 35 |
+from nbxmpp.errors import StanzaError
|
|
| 36 | 36 |
from nbxmpp.protocol import JID
|
| 37 | 37 |
from nbxmpp.errors import is_error
|
| 38 | 38 |
|
| ... | ... | @@ -261,11 +261,18 @@ class VcardWindow(EventHelper): |
| 261 | 261 |
self._set_values(vcard.data, str(jid))
|
| 262 | 262 |
self._load_avatar(vcard)
|
| 263 | 263 |
|
| 264 |
- def set_os_info(self, result, jid):
|
|
| 264 |
+ def set_os_info(self, task):
|
|
| 265 |
+ error = False
|
|
| 266 |
+ try:
|
|
| 267 |
+ result = task.finish()
|
|
| 268 |
+ except StanzaError:
|
|
| 269 |
+ error = True
|
|
| 270 |
+ |
|
| 271 |
+ jid = task.get_user_data()
|
|
| 272 |
+ |
|
| 265 | 273 |
if self.xml.get_object('information_notebook').get_n_pages() < 5:
|
| 266 | 274 |
return
|
| 267 | 275 |
|
| 268 |
- error = is_error_result(result)
|
|
| 269 | 276 |
i = 0
|
| 270 | 277 |
client = ''
|
| 271 | 278 |
os_info = ''
|