diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-23 16:15:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-23 16:15:08 -0300 |
| commit | 44ae571c1d57a21af2c915b42bb656cf0d69c9ee (patch) | |
| tree | 757e53f443e27a95d1b1b0cdf337c2147953fc46 /libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch | |
| parent | eadbb9961b89668e4aed317f5dd97cb04e86663e (diff) | |
| parent | 1d20e4962664ab152948a14b4320b12204a1053e (diff) | |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/libftdi/PKGBUILD
community/lxshortcut/PKGBUILD
community/pcmanfm/PKGBUILD
community/qingy/PKGBUILD
community/yagf/PKGBUILD
extra/ethtool/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/postgresql/PKGBUILD
extra/xfburn/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch')
| -rw-r--r-- | libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch b/libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch new file mode 100644 index 000000000..00969349d --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.3-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) + { |