Apply patch from upstream to fix GPG key import

2 files changed, 30 insertions, 1 deletions

diff --git a/debian/patches/ImportDialog-Fix-import-dialog.patch b/debian/patches/ImportDialog-Fix-import-dialog.patch
new file mode 100644
index 00000000..1599407b
--- /dev/null
+++ b/debian/patches/ImportDialog-Fix-import-dialog.patch
@@ -0,0 +1,29 @@
+From: Jeremias Ortega <jeremias@ortega.tech>
+Date: Mon, 9 Nov 2020 22:39:01 -0600
+Subject: ImportDialog: Fix import dialog
+
+The import dialog fails to import files without showing any warning.
+The dialog closes before it finishes the import process and cancels it.
+
+This is solved by making the import button not return a response directly.
+
+Bug: https://gitlab.gnome.org/GNOME/seahorse/-/issues/236
+Bug-Debian: https://bugs.debian.org/931558
+Origin: upstream, 40~alpha, commit:6cc0fe7381a4c9536123bf877b3e055774b2f0a9
+---
+ src/import-dialog.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/import-dialog.vala b/src/import-dialog.vala
+index 983b7e4..650aaa2 100644
+--- a/src/import-dialog.vala
++++ b/src/import-dialog.vala
+@@ -41,7 +41,7 @@ public class Seahorse.ImportDialog : Gtk.Dialog {
+         this.import.get_style_context().add_class("suggested-action");
+         this.import.importing.connect(() => this.viewer.clear_error());
+         this.import.imported.connect(on_import_button_imported);
+-        add_action_widget(this.import, Gtk.ResponseType.OK);
++        ((Gtk.HeaderBar) get_header_bar()).pack_end(this.import);
+ 
+         this.viewer = new Gcr.ViewerWidget();
+         this.viewer.added.connect((v, r, parsed) => this.import.add_parsed(parsed));
diff --git a/debian/patches/series b/debian/patches/series
index 8b137891..37c55ee6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-
+ImportDialog-Fix-import-dialog.patch