summaryrefslogtreecommitdiff
path: root/libre/xarchiver/fix-password-protected.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-30 16:46:10 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-30 16:46:10 -0300
commit272855c0b93e2c37030a145d0d502f55d6abfd00 (patch)
tree4793ace93a9d0cc062d01b812fb03d6d657c2ca7 /libre/xarchiver/fix-password-protected.patch
parent50b9c9ce6d0b4bfb80c10234d4876fbf1018d2c0 (diff)
downloadabslibre-272855c0b93e2c37030a145d0d502f55d6abfd00.tar.gz
abslibre-272855c0b93e2c37030a145d0d502f55d6abfd00.tar.bz2
abslibre-272855c0b93e2c37030a145d0d502f55d6abfd00.zip
xarchiver-0.5.4-1.parabola1: updating version
Diffstat (limited to 'libre/xarchiver/fix-password-protected.patch')
-rw-r--r--libre/xarchiver/fix-password-protected.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/libre/xarchiver/fix-password-protected.patch b/libre/xarchiver/fix-password-protected.patch
new file mode 100644
index 000000000..00969349d
--- /dev/null
+++ b/libre/xarchiver/fix-password-protected.patch
@@ -0,0 +1,42 @@
+diff -Naur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.2/src/window.c
+--- xarchiver-0.5.3.orig/src/window.c 2014-01-24 08:10:09.305990000 +0100
++++ xarchiver-0.5.3/src/window.c 2014-01-24 08:42:45.110729290 +0100
+@@ -1694,7 +1694,7 @@
+ {
+ if (archive->passwd == NULL)
+ {
+- archive->passwd = xa_create_password_dialog(NULL);
++ archive->passwd = xa_create_password_dialog(archive);
+ if ( archive->passwd == NULL)
+ {
+ gtk_drag_finish (dc,FALSE,FALSE,t);
+@@ -2702,9 +2702,12 @@
+
+ if (entry->is_encrypted)
+ {
+- archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
+ if (archive[idx]->passwd == NULL)
+- return;
++ {
++ archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
++ if (archive[idx]->passwd == NULL)
++ return;
++ }
+ }
+ filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL);
+ if (g_file_test(filename,G_FILE_TEST_EXISTS))
+@@ -2768,8 +2771,12 @@
+ {
+ if (entry->is_encrypted)
+ {
+- if (archive->passwd == NULL)
+- return;
++ if (archive->passwd == NULL)
++ {
++ archive->passwd = xa_create_password_dialog(archive);
++ if (archive->passwd == NULL)
++ return;
++ }
+ }
+ if (archive->extraction_path)
+ {