diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-09-30 23:35:51 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-09-30 23:35:51 -0400 |
| commit | 2d3e592da3ea7517e48f4a253d3621a4a4e2a5d9 (patch) | |
| tree | 84ba56e0f5d4c60ee48800546539a0c7360e2cad /libre/xarchiver/fix-password-protected.patch | |
| parent | 77b540c3dd5583081493304a0481808cd5cb0c03 (diff) | |
| parent | 272855c0b93e2c37030a145d0d502f55d6abfd00 (diff) | |
Merge branch 'master' of git://lukeshu.com/mirror/parabola/abslibre
Diffstat (limited to 'libre/xarchiver/fix-password-protected.patch')
| -rw-r--r-- | libre/xarchiver/fix-password-protected.patch | 42 |
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) + { |