file-roller r2269 - in branches/gnome-2-22: . data/icons/24x24/apps src

[paobac svn gnome org]

Author: paobac
Date: Tue Apr 29 08:27:30 2008
New Revision: 2269
URL: http://svn.gnome.org/viewvc/file-roller?rev=2269&view=rev

Log:
2008-04-29  Paolo Bacchilega  <paobac svn gnome org>

	* src/fr-window.c: 
	* src/fr-archive.c (add_dropped_items): 

	Fixed bug #480190 â files added to archive are wrongly placed in root


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/data/icons/24x24/apps/   (props changed)
   branches/gnome-2-22/src/fr-archive.c
   branches/gnome-2-22/src/fr-window.c

Modified: branches/gnome-2-22/src/fr-archive.c
==============================================================================
--- branches/gnome-2-22/src/fr-archive.c	(original)
+++ branches/gnome-2-22/src/fr-archive.c	Tue Apr 29 08:27:30 2008
@@ -2437,7 +2437,7 @@
 		fr_archive_add_items (data->archive,
 				      list,
 				      first_base_dir,
-				      NULL,
+				      data->dest_dir,
 				      data->update,
 				      data->password,
 				      data->compression);
@@ -2466,7 +2466,7 @@
 		fr_archive_add_directory (archive,
 					  file_name_from_path (path),
 					  base_dir,
-					  NULL,
+					  data->dest_dir,
 					  data->update,
 					  data->password,
 					  data->compression);
@@ -2491,7 +2491,7 @@
 		fr_archive_add_files (archive,
 				      only_names_list,
 				      first_basedir,
-				      data->base_dir,
+				      data->dest_dir,
 				      data->update,
 				      data->password,
 				      data->compression);

Modified: branches/gnome-2-22/src/fr-window.c
==============================================================================
--- branches/gnome-2-22/src/fr-window.c	(original)
+++ branches/gnome-2-22/src/fr-window.c	Tue Apr 29 08:27:30 2008
@@ -3466,7 +3466,8 @@
 	    && ! window->archive->read_only
 	    && ! window->archive->is_compressed_file
 	    && ((window->archive->command != NULL)
-		&& window->archive->command->propCanModify)) {
+		&& window->archive->command->propCanModify)) 
+	{
 		if (one_file && is_an_archive) {
 			GtkWidget *d;
 			gint       r;
@@ -5316,8 +5317,8 @@
                 GtkWidget *vbox;
                 
                 vbox = gtk_vbox_new (FALSE, 0);
-                gtk_box_pack_start (GTK_BOX (window->priv->statusbar), vbox, FALSE, FALSE, 0);
-                gtk_box_pack_start (GTK_BOX (vbox), window->priv->progress_bar, TRUE, FALSE, 0);
+                gtk_box_pack_end (GTK_BOX (window->priv->statusbar), vbox, FALSE, FALSE, 0);
+                gtk_box_pack_start (GTK_BOX (vbox), window->priv->progress_bar, TRUE, TRUE, 1);
                 gtk_widget_show (vbox);
         }
 	gnome_app_set_statusbar (GNOME_APP (window), window->priv->statusbar);