Author: colossus
Date: 2008-11-08 20:06:57 +0000 (Sat, 08 Nov 2008)
New Revision: 28670
Modified:
xarchiver/trunk/TODO
xarchiver/trunk/src/main.c
xarchiver/trunk/src/tar.c
Log:
Fixed bug when adding with the thunar archive plugin, thanks to Frank Caraballo
for pointing it out.
Fixed missed deletion of files with tar.lzop compressed archives.
Updated TODO file.
Modified: xarchiver/trunk/TODO
===================================================================
--- xarchiver/trunk/TODO 2008-11-08 17:28:50 UTC (rev 28669)
+++ xarchiver/trunk/TODO 2008-11-08 20:06:57 UTC (rev 28670)
@@ -1,4 +1,3 @@
- reduce the loading time when opening large archives.
- to fix bugs #4299 and #3235.
-- fix adding when using tap
Modified: xarchiver/trunk/src/main.c
===================================================================
--- xarchiver/trunk/src/main.c 2008-11-08 17:28:50 UTC (rev 28669)
+++ xarchiver/trunk/src/main.c 2008-11-08 20:06:57 UTC (rev 28670)
@@ -27,11 +27,11 @@
#endif
gchar *absolute_path = NULL;
-//gchar *archive_name = NULL;
gchar *_current_dir = NULL;
gchar *extract_path = NULL;
GError *cli_error = NULL;
-gboolean error_output, file_to_open, ask_and_extract, add_files,ask_and_add,
multi_extract;
+gchar *add_files;
+gboolean error_output, file_to_open, ask_and_extract, ask_and_add,
multi_extract;
gboolean batch_mode = FALSE;
gboolean unrar = FALSE;
gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE;
@@ -65,7 +65,7 @@
N_("Multi-extract archives"),
N_("filenames")
},
- { "add-to", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
&add_files,
+ { "add-to", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING,
&add_files,
N_("Add the given files by asking the name of the archive and
quits."),
N_("file1 file2 file3 ... fileN")
},
@@ -192,6 +192,10 @@
chdir (_current_dir);
g_free(_current_dir);
GSList *files = NULL;
+ _current_dir = g_path_get_basename(add_files);
+ files =
g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
+ g_free(_current_dir);
+ g_free(add_files);
for (x = 1; x< argc; x++)
{
_current_dir =
g_path_get_basename(argv[x]);
Modified: xarchiver/trunk/src/tar.c
===================================================================
--- xarchiver/trunk/src/tar.c 2008-11-08 17:28:50 UTC (rev 28669)
+++ xarchiver/trunk/src/tar.c 2008-11-08 20:06:57 UTC (rev 28670)
@@ -435,7 +435,7 @@
break;
case XARCHIVETYPE_TAR_LZOP:
executable = "lzop -f ";
- filename = "dummy.lzop";
+ filename = "dummy.lzo";
break;
default:
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
