[Xfce4-commits] r23225 - xarchiver/branches/xarchiver-psybsd/src

[Stephan Arts]

Author: stephan
Date: 2006-09-28 11:26:25 +0000 (Thu, 28 Sep 2006)
New Revision: 23225

Modified:
   xarchiver/branches/xarchiver-psybsd/src/extract_dialog.c
   xarchiver/branches/xarchiver-psybsd/src/main_window.c
Log:
really fixed extract


Modified: xarchiver/branches/xarchiver-psybsd/src/extract_dialog.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/extract_dialog.c	2006-09-28 11:03:18 UTC (rev 23224)
+++ xarchiver/branches/xarchiver-psybsd/src/extract_dialog.c	2006-09-28 11:26:25 UTC (rev 23225)
@@ -108,7 +108,7 @@
 	GtkWidget *test, *hbox;
 	XAExtractArchiveDialog *dialog;
 
-	dialog = g_object_new(xa_extract_archive_dialog_get_type(), "title", _("Extract archive"), "action", GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER, "do-overwrite-confirmation", TRUE, NULL);
+	dialog = g_object_new(xa_extract_archive_dialog_get_type(), "title", _("Extract archive"), "action", GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, "do-overwrite-confirmation", TRUE, NULL);
 /* Handle 'extract selected files' option */
 	gtk_widget_set_sensitive(dialog->sel_files_radio, sel_option);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->sel_files_radio), sel_option);

Modified: xarchiver/branches/xarchiver-psybsd/src/main_window.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main_window.c	2006-09-28 11:03:18 UTC (rev 23224)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.c	2006-09-28 11:26:25 UTC (rev 23225)
@@ -532,23 +532,22 @@
 			GList *rows = gtk_tree_selection_get_selected_rows(selection, &treemodel);
 			GList *_rows = rows;
 			gchar *working_dir = xa_main_window_get_working_dir(window);
-			while(_rows != NULL)
+			while(_rows)
 			{
-				gtk_tree_model_get_iter(GTK_TREE_MODEL(treemodel), &iter, rows->data);
+				gtk_tree_model_get_iter(GTK_TREE_MODEL(treemodel), &iter, _rows->data);
 				if(window->props._show_icons)
 					gtk_tree_model_get_value(GTK_TREE_MODEL(treemodel), &iter, 1, value);
 				else
 					gtk_tree_model_get_value(GTK_TREE_MODEL(treemodel), &iter, 0, value);
 
-				filenames = g_slist_prepend(filenames, g_strconcat(working_dir, g_value_get_string(value), NULL));
+				filenames = g_slist_prepend(filenames, g_strconcat(working_dir, "/", g_value_get_string(value), NULL));
 				g_value_unset(value);
 				_rows = _rows->next;
 			}
 			g_free(working_dir);
 			g_list_free(rows);
-			lxa_archive_support_extract(lp_support, window->lp_xa_archive, extract_archive_path, filenames);
-		} else
-			lxa_archive_support_extract(lp_support, window->lp_xa_archive, extract_archive_path, NULL);
+		}
+		lxa_archive_support_extract(lp_support, window->lp_xa_archive, extract_archive_path, filenames);
 		g_free(extract_archive_path);
 		extract_archive_path = NULL;
 	}