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

[Giuseppe Torelli]

Author: colossus
Date: 2006-08-02 07:46:47 +0000 (Wed, 02 Aug 2006)
New Revision: 22624

Modified:
   xarchiver/trunk/src/callbacks.c
   xarchiver/trunk/src/callbacks.h
Log:
Fixing missing storage of the Add dialog settings Before adding with DnD.


Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c	2006-08-02 07:31:21 UTC (rev 22623)
+++ xarchiver/trunk/src/callbacks.c	2006-08-02 07:46:47 UTC (rev 22624)
@@ -1863,13 +1863,6 @@
 	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)
-		{
-			name = g_path_get_basename ( filename );
-			ConcatenateFileNames2 ( name, names );
-			g_free (name);
-		}
-		else*/
 		name = g_path_get_basename ( filename );
 		g_free (filename);
 		ConcatenateFileNames2 ( name, names );
@@ -1877,6 +1870,8 @@
 		len++;
 	}
 	archive->status = XA_ARCHIVESTATUS_ADD;
+	full_path = archive->full_path;
+	add_recurse = archive->add_recurse;
 	archive->full_path = 0;
 	archive->add_recurse = 1;
 	command = xa_add_single_files ( archive, names, NULL );
@@ -1887,6 +1882,8 @@
 	}
 	g_string_free (names, TRUE);
 	g_strfreev ( array );
+	archive->full_path = full_path;
+	archive->add_recurse = add_recurse;
 }
 
 gboolean key_press_function (GtkWidget *widget, GdkEventKey *event, gpointer data)

Modified: xarchiver/trunk/src/callbacks.h
===================================================================
--- xarchiver/trunk/src/callbacks.h	2006-08-02 07:31:21 UTC (rev 22623)
+++ xarchiver/trunk/src/callbacks.h	2006-08-02 07:46:47 UTC (rev 22624)
@@ -49,7 +49,7 @@
 short int response;
 double content_size;
 unsigned long long int file_size, file_offset;
-gboolean done,full_path,overwrite;
+gboolean done,full_path,overwrite,add_recurse;
 Extract_dialog_data *extract_window;
 Add_dialog_data *add_window;
 GtkWidget *dialog , *textview, *scrollwin, *vbox, *OutputWindow , *File_Selector , *view_window, *archive_properties_win;