copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Handle nbxmpp error results

Browse source
This commit is contained in:
Philipp Hörist 2019-02-10 00:39:10 +01:00
parent 5059f72373
commit 1256372d36
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gajim/common/modules/blocking.py
View file

@ -17,6 +17,7 @@
import logging import logging
import nbxmpp import nbxmpp
from nbxmpp.util import is_error_result
from gajim.common import app from gajim.common import app
from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkEvent
@ -62,8 +63,8 @@ class Blocking(BaseModule):
log.info('Discovered blocking: %s', from_) log.info('Discovered blocking: %s', from_)
def _blocking_list_received(self, result): def _blocking_list_received(self, result):
if result.is_error: if is_error_result(result):
log.info('Error: %s', result.error) log.info('Error: %s', result)
return return
self.blocked = result.blocking_list self.blocked = result.blocking_list

5
gajim/common/modules/bookmarks.py
View file

@ -22,6 +22,7 @@ import logging
import copy import copy
import nbxmpp import nbxmpp
from nbxmpp.util import is_error_result
from nbxmpp.structs import BookmarkData from nbxmpp.structs import BookmarkData
from nbxmpp.const import BookmarkStoreType from nbxmpp.const import BookmarkStoreType
from gi.repository import GLib from gi.repository import GLib
@ -161,6 +162,10 @@ class Bookmarks(BaseModule):
type_, callback=self._bookmarks_received) type_, callback=self._bookmarks_received)
def _bookmarks_received(self, bookmarks): def _bookmarks_received(self, bookmarks):
if is_error_result(bookmarks):
log.info('Error: %s', bookmarks)
bookmarks = []
self._request_in_progress = False self._request_in_progress = False
self._bookmarks = bookmarks self._bookmarks = bookmarks
self.auto_join_bookmarks() self.auto_join_bookmarks()

5
gajim/common/modules/user_avatar.py
View file

@ -17,6 +17,7 @@
import logging import logging
import nbxmpp import nbxmpp
from nbxmpp.util import is_error_result
from gajim.common import app from gajim.common import app
from gajim.common.modules.base import BaseModule from gajim.common.modules.base import BaseModule
@ -65,6 +66,10 @@ class UserAvatar(BaseModule):
jid, data.id, callback=self._avatar_received) jid, data.id, callback=self._avatar_received)
def _avatar_received(self, result): def _avatar_received(self, result):
if is_error_result(result):
log.info('Error: %s', result)
return
log.info('Received Avatar: %s %s', result.jid, result.sha) log.info('Received Avatar: %s %s', result.jid, result.sha)
app.interface.save_avatar(result.data) app.interface.save_avatar(result.data)