[Xfce4-commits] r22623 - xarchiver/trunk/src

[Giuseppe Torelli]

Author: colossus
Date: 2006-08-02 07:31:21 +0000 (Wed, 02 Aug 2006)
New Revision: 22623

Modified:
   xarchiver/trunk/src/add_dialog.c
   xarchiver/trunk/src/callbacks.c
Log:
Fixed wrong behaviour when adding a directory through DnD.


Modified: xarchiver/trunk/src/add_dialog.c
===================================================================
--- xarchiver/trunk/src/add_dialog.c	2006-08-02 06:57:49 UTC (rev 22622)
+++ xarchiver/trunk/src/add_dialog.c	2006-08-02 07:31:21 UTC (rev 22623)
@@ -550,7 +550,7 @@
 				gtk_list_store_remove (add_dialog->file_liststore, &iter);
 			}
 			gtk_widget_set_sensitive (Stop_button , TRUE);			
-				xa_set_button_state (0,0,0,0,0);
+			xa_set_button_state (0,0,0,0,0);
 			archive->status = XA_ARCHIVESTATUS_ADD;
 
 			if (archive->type != XARCHIVETYPE_BZIP2 && archive->type != XARCHIVETYPE_GZIP)

Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c	2006-08-02 06:57:49 UTC (rev 22622)
+++ xarchiver/trunk/src/callbacks.c	2006-08-02 07:31:21 UTC (rev 22623)
@@ -1859,22 +1859,26 @@
 	g_free (_current_dir);
 	chdir ( current_dir );
 	g_free (current_dir);
+	
 	while (array[len])
 	{
 		filename = g_filename_from_uri ( array[len] , NULL, NULL );
-		if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_BZ2)
+		/*if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_BZ2)
 		{
 			name = g_path_get_basename ( filename );
 			ConcatenateFileNames2 ( name, names );
 			g_free (name);
 		}
-		else
-			ConcatenateFileNames2 ( filename, names );
+		else*/
+		name = g_path_get_basename ( filename );
 		g_free (filename);
+		ConcatenateFileNames2 ( name, names );
+		g_free (name);
 		len++;
 	}
 	archive->status = XA_ARCHIVESTATUS_ADD;
-	archive->full_path = 1;
+	archive->full_path = 0;
+	archive->add_recurse = 1;
 	command = xa_add_single_files ( archive, names, NULL );
 	if (command != NULL)
 	{