[Xfce4-commits] r27210 - in xarchiver/trunk: . src
Giuseppe Torelli
colossus at xfce.org
Fri Jul 4 13:51:35 CEST 2008
Author: colossus
Date: 2008-07-04 11:51:35 +0000 (Fri, 04 Jul 2008)
New Revision: 27210
Modified:
xarchiver/trunk/TODO
xarchiver/trunk/src/add_dialog.c
xarchiver/trunk/src/bzip2.c
xarchiver/trunk/src/bzip2.h
xarchiver/trunk/src/main.c
Log:
Fixed bug #3494.
Updated TODO.
Increased the space in add dialog between the tabs and the rest of the dialog.
Modified: xarchiver/trunk/TODO
===================================================================
--- xarchiver/trunk/TODO 2008-07-04 09:26:29 UTC (rev 27209)
+++ xarchiver/trunk/TODO 2008-07-04 11:51:35 UTC (rev 27210)
@@ -1,11 +1,9 @@
- fix adding in the archive directories with dnd.
- fix the directories bug with 7z
- fix the remaining bugs in bugzilla.xfce.org
-- enrich the status bar
- to fix the arrow buttons
- add a small progress window when using Xarchiver cmd-line switches.
- loading and saving of add/extraction options.
- support tar on *BSD.
- avoid reset of extract dialog options when loading a new archive.
- ability to create sfx archives through the Add dialog for those archives which support it.
-- ability to create a comment to the archive through the Add dialog.
Modified: xarchiver/trunk/src/add_dialog.c
===================================================================
--- xarchiver/trunk/src/add_dialog.c 2008-07-04 09:26:29 UTC (rev 27209)
+++ xarchiver/trunk/src/add_dialog.c 2008-07-04 11:51:35 UTC (rev 27210)
@@ -50,19 +50,18 @@
gtk_container_set_border_width (GTK_CONTAINER (add_dialog->notebook1),4);
/* Selection page */
- vbox1 = gtk_vbox_new (FALSE,0);
+ vbox1 = gtk_vbox_new (FALSE,2);
gtk_container_add (GTK_CONTAINER (add_dialog->notebook1), vbox1);
label1 = gtk_label_new (_("Selection"));
gtk_notebook_set_tab_label (GTK_NOTEBOOK (add_dialog->notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (add_dialog->notebook1), 0), label1);
add_dialog->filechooserwidget1 = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_box_pack_start (GTK_BOX (vbox1), add_dialog->filechooserwidget1, TRUE, TRUE,0);
+ gtk_box_pack_start (GTK_BOX (vbox1), add_dialog->filechooserwidget1, TRUE, TRUE,2);
if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA)
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),FALSE);
else
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),TRUE);
- //gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1));
add_dialog->frame1 = gtk_frame_new (NULL);
gtk_box_pack_start (GTK_BOX (vbox1), add_dialog->frame1, FALSE, TRUE,5);
Modified: xarchiver/trunk/src/bzip2.c
===================================================================
--- xarchiver/trunk/src/bzip2.c 2008-07-04 09:26:29 UTC (rev 27209)
+++ xarchiver/trunk/src/bzip2.c 2008-07-04 11:51:35 UTC (rev 27210)
@@ -171,27 +171,27 @@
xa_create_liststore (archive,names);
}
-void lzma_gzip_bzip2_extract (XArchive *archive)
+void lzma_gzip_bzip2_extract (XArchive *archive,GString *dummy)
{
GSList *list = NULL;
gchar *command,*executable = NULL,*filename = NULL, *dot = NULL, *filename_noext = NULL;
gchar tmp_dir[14] = "";
gboolean result = FALSE;
+ filename = xa_remove_path_from_archive_name(archive->escaped_path);
switch (archive->type)
{
case XARCHIVETYPE_BZIP2:
executable = "bzip2 -f -d ";
- filename = archive->escaped_path;
- break;
+ break;
+
case XARCHIVETYPE_GZIP:
executable = "gzip -f -d -n ";
- filename = archive->escaped_path;
- break;
+ break;
+
case XARCHIVETYPE_LZMA:
executable = "lzma -f -d ";
- filename = archive->escaped_path;
- break;
+ break;
default:
break;
@@ -200,29 +200,23 @@
result = xa_create_temp_directory(archive,tmp_dir);
if (result == 0)
return;
-//TODO: fix the crash when viewing a bzip2 compressed file
- if (extract_window)
- {
- archive->extraction_path = g_strdup (gtk_entry_get_text (GTK_ENTRY (extract_window->destination_path_entry)));
- command = g_strconcat ("cp -f ",archive->escaped_path," ",archive->tmp,"/",filename,NULL);
- list = g_slist_append(list,command);
+
+ command = g_strconcat ("cp -f ",archive->escaped_path," ",archive->tmp,NULL);
+ list = g_slist_append(list,command);
- command = g_strconcat(executable,archive->tmp,"/",filename,NULL);
- list = g_slist_append(list,command);
+ command = g_strconcat(executable,archive->tmp,"/",filename,NULL);
+ list = g_slist_append(list,command);
- if (xa_main_window)
- command = g_strconcat("mv -f ",archive->tmp," ",archive->extraction_path,"/",archive->root_entry->child->filename,NULL);
- else
- {
- dot = strchr(filename,'.');
- if (G_LIKELY(dot))
- filename_noext = g_strndup(filename, ( dot - filename ));
- command = g_strconcat("mv -f ",archive->tmp,"/",filename_noext," ",archive->extraction_path,NULL);
- g_free(filename_noext);
- }
-
- list = g_slist_append(list,command);
- xa_run_command (archive,list);
+ dot = strchr(filename,'.');
+ if (G_LIKELY(dot))
+ {
+ filename_noext = g_strndup(filename, ( dot - filename ));
+ command = g_strconcat("mv -f ",archive->tmp,"/",filename_noext," ",archive->extraction_path,NULL);
+ g_free(filename_noext);
}
+ g_free(filename);
+
+ list = g_slist_append(list,command);
+ xa_run_command (archive,list);
}
Modified: xarchiver/trunk/src/bzip2.h
===================================================================
--- xarchiver/trunk/src/bzip2.h 2008-07-04 09:26:29 UTC (rev 27209)
+++ xarchiver/trunk/src/bzip2.h 2008-07-04 11:51:35 UTC (rev 27210)
@@ -25,6 +25,6 @@
#include "archive.h"
void xa_open_bzip2_lzma (XArchive *,GString *);
-void lzma_gzip_bzip2_extract (XArchive *);
+void lzma_gzip_bzip2_extract (XArchive *,GString*);
void xa_open_tar_compressed_file(XArchive *);
#endif
Modified: xarchiver/trunk/src/main.c
===================================================================
--- xarchiver/trunk/src/main.c 2008-07-04 09:26:29 UTC (rev 27209)
+++ xarchiver/trunk/src/main.c 2008-07-04 11:51:35 UTC (rev 27210)
@@ -309,7 +309,7 @@
extract[1] = &xa_7zip_extract;
extract[2] = &xa_arj_extract;
extract[3] = &xa_deb_extract;;
- extract[4] = extract[5] = extract[6] = &xa_tar_extract;
+ extract[4] = extract[5] = extract[6] = &lzma_gzip_bzip2_extract;
extract[7] = &xa_rar_extract;
extract[8] = &xa_rpm_extract;
extract[9] = extract[10] = extract[11] = extract[12] = &xa_tar_extract;
More information about the Xfce4-commits
mailing list