From 2cc719be9b3ce0f2f01d20cfe781327808ddfbe4 Mon Sep 17 00:00:00 2001 From: wurstsalat Date: Tue, 8 Sep 2020 20:17:57 +0200 Subject: [PATCH] Adapt to upstream ConfirmationDialog name change --- omemo/file_crypto.py | 4 ++-- omemo/gtk/key.py | 4 ++-- openpgp/gtk/key.py | 4 ++-- pgp/plugin.py | 4 ++-- plugin_installer/plugin_installer.py | 6 +++--- tictactoe/plugin.py | 4 ++-- whiteboard/plugin.py | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/omemo/file_crypto.py b/omemo/file_crypto.py index 37d40a2..052eb86 100644 --- a/omemo/file_crypto.py +++ b/omemo/file_crypto.py @@ -32,7 +32,7 @@ from gajim.common.const import FTState from gajim.common.filetransfer import FileTransfer from gajim.plugins.plugins_i18n import _ from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from omemo.backend.aes import aes_decrypt_file @@ -149,7 +149,7 @@ class FileDecryption: def _open_folder(): open_file(file_path.parent) - NewConfirmationDialog( + ConfirmationDialog( _('Open File'), _('Open File?'), _('Do you want to open %s?') % file_path.name, diff --git a/omemo/gtk/key.py b/omemo/gtk/key.py index 5b2a4db..9cc2a84 100644 --- a/omemo/gtk/key.py +++ b/omemo/gtk/key.py @@ -28,7 +28,7 @@ from gi.repository import GdkPixbuf from gajim.common import app from gajim.plugins.plugins_i18n import _ from gajim.plugins.helpers import get_builder -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import DialogButton from omemo.backend.util import Trust @@ -293,7 +293,7 @@ class KeyRow(Gtk.ListBoxRow): self.get_parent().remove(self) self.destroy() - NewConfirmationDialog( + ConfirmationDialog( _('Delete'), _('Delete Fingerprint'), _('Doing so will permanently delete this Fingerprint'), diff --git a/openpgp/gtk/key.py b/openpgp/gtk/key.py index 7142492..a8244e4 100644 --- a/openpgp/gtk/key.py +++ b/openpgp/gtk/key.py @@ -21,7 +21,7 @@ from gi.repository import Gtk from gajim.common import app -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import DialogButton from gajim.plugins.plugins_i18n import _ @@ -120,7 +120,7 @@ class KeyRow(Gtk.ListBoxRow): self.key.delete() self.destroy() - NewConfirmationDialog( + ConfirmationDialog( _('Delete'), _('Delete Public Key'), _('This will permanently delete this public key'), diff --git a/pgp/plugin.py b/pgp/plugin.py index 708e683..513b319 100644 --- a/pgp/plugin.py +++ b/pgp/plugin.py @@ -28,7 +28,7 @@ from gajim.plugins.plugins_i18n import _ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationCheckDialog +from gajim.gtk.dialogs import ConfirmationCheckDialog from pgp.gtk.key import KeyDialog from pgp.gtk.config import PGPConfigDialog @@ -136,7 +136,7 @@ class PGPPlugin(GajimPlugin): @staticmethod def _on_not_trusted(event): - NewConfirmationCheckDialog( + ConfirmationCheckDialog( _('Untrusted PGP key'), _('Untrusted PGP key'), _('The PGP key used to encrypt this chat is not ' diff --git a/plugin_installer/plugin_installer.py b/plugin_installer/plugin_installer.py index 97f65c5..d04b962 100644 --- a/plugin_installer/plugin_installer.py +++ b/plugin_installer/plugin_installer.py @@ -31,7 +31,7 @@ from gajim.plugins.plugins_i18n import _ from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import InformationDialog -from gajim.gtk.dialogs import NewConfirmationCheckDialog +from gajim.gtk.dialogs import ConfirmationCheckDialog from plugin_installer.config_dialog import PluginInstallerConfigDialog from plugin_installer.widget import AvailablePage @@ -130,7 +130,7 @@ class PluginInstaller(GajimPlugin): self._download_plugins(plugins) plugins_str = '\n' + '\n'.join([plugin.name for plugin in plugins]) - NewConfirmationCheckDialog( + ConfirmationCheckDialog( _('Plugin Updates'), _('Plugin Updates Available'), _('There are updates for your plugins:\n' @@ -236,7 +236,7 @@ class PluginInstaller(GajimPlugin): def _on_ok(is_checked): if is_checked: self.config['auto_update_feedback'] = False - NewConfirmationCheckDialog( + ConfirmationCheckDialog( _('Plugins Updated'), _('Plugins Updated'), _('Plugin updates have successfully been downloaded.\n' diff --git a/tictactoe/plugin.py b/tictactoe/plugin.py index f73a23e..700e565 100644 --- a/tictactoe/plugin.py +++ b/tictactoe/plugin.py @@ -45,7 +45,7 @@ from gajim.common import ged from gajim.common.connection_handlers_events import InformationEvent from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.plugins import GajimPlugin from gajim.plugins.helpers import log @@ -160,7 +160,7 @@ class TictactoePlugin(GajimPlugin): else: name = obj.jid - NewConfirmationDialog( + ConfirmationDialog( _('Incoming Tictactoe'), _('Incoming Tictactoe Invitation'), _('%(name)s (%(jid)s) wants to play tictactoe with you.') % { diff --git a/whiteboard/plugin.py b/whiteboard/plugin.py index 3faa722..e2abc21 100644 --- a/whiteboard/plugin.py +++ b/whiteboard/plugin.py @@ -42,7 +42,7 @@ from gajim.common.jingle_transport import JingleTransport from gajim.common.jingle_transport import TransportType from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialog from gajim.plugins import GajimPlugin from gajim.plugins.gajimplugin import GajimPluginException @@ -163,7 +163,7 @@ class WhiteboardPlugin(GajimPlugin): else: name = jid - NewConfirmationDialog( + ConfirmationDialog( _('Incoming Whiteboard'), _('Incoming Whiteboard Request'), _('%(name)s (%(jid)s) wants to start a whiteboard with '