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

Adapt to BlockingListResult changes in nbxmpp

This commit is contained in:
Philipp Hörist 2019-02-11 22:24:20 +01:00
parent dede4ba4f2
commit c2038b0ffe
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gajim/gtk/blocking.py
View File

@ -14,8 +14,10 @@
import logging import logging
from nbxmpp.util import is_error_result
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import Gdk from gi.repository import Gdk
from gi.repository import GLib
from gajim.common import app from gajim.common import app
from gajim.common.i18n import _ from gajim.common.i18n import _
@ -67,15 +69,16 @@ class BlockingList(Gtk.ApplicationWindow):
dialog = HigDialog( dialog = HigDialog(
self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK,
_('Error!'), _('Error!'),
error) GLib.markup_escape_text(str(error)))
dialog.popup() dialog.popup()
def _on_blocking_list_received(self, result): def _on_blocking_list_received(self, result):
is_error = is_error_result(result)
self._disable_spinner() self._disable_spinner()
self._set_grid_state(not result.is_error) self._set_grid_state(not is_error)
if result.is_error: if is_error:
self._show_error(result.error) self._show_error(result)
else: else:
self._prev_blocked_jids = set(result.blocking_list) self._prev_blocked_jids = set(result.blocking_list)
@ -85,8 +88,8 @@ class BlockingList(Gtk.ApplicationWindow):
def _on_save_result(self, result): def _on_save_result(self, result):
self._await_results -= 1 self._await_results -= 1
if result.is_error and not self._received_errors: if is_error_result(result) and not self._received_errors:
self._show_error(result.error) self._show_error(result)
self._received_errors = True self._received_errors = True
if not self._await_results: if not self._await_results: