file-roller r2270 - in trunk: . src

[paobac svn gnome org]

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

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

	* src/gconf-utils.c: fixed memory leak.
	* src/file-utils.c: 
	* src/fr-archive.c (add_dropped_items): 
	
	Fixed bug #480190 â files added to archive are wrongly placed in root


Modified:
   trunk/ChangeLog
   trunk/src/file-utils.c
   trunk/src/fr-archive.c
   trunk/src/gconf-utils.c

Modified: trunk/src/file-utils.c
==============================================================================
--- trunk/src/file-utils.c	(original)
+++ trunk/src/file-utils.c	Tue Apr 29 08:33:58 2008
@@ -821,6 +821,9 @@
 			g_free (folder);
 	}
 
+	if (best_folder == NULL)
+		return NULL;
+
 	template = g_strconcat (best_folder + strlen ("file://"), "/.fr-XXXXXX", NULL);
 	result = mkdtemp (template);
 

Modified: trunk/src/fr-archive.c
==============================================================================
--- trunk/src/fr-archive.c	(original)
+++ trunk/src/fr-archive.c	Tue Apr 29 08:33:58 2008
@@ -2251,7 +2251,7 @@
 		fr_archive_add_items (data->archive,
 				      list,
 				      first_base_dir,
-				      NULL,
+				      data->dest_dir,
 				      data->update,
 				      data->password,
 				      data->compression);
@@ -2280,7 +2280,7 @@
 		fr_archive_add_directory (archive,
 					  file_name_from_path (path),
 					  base_dir,
-					  NULL,
+					  data->dest_dir,
 					  data->update,
 					  data->password,
 					  data->compression);
@@ -2305,7 +2305,7 @@
 		fr_archive_add_files (archive,
 				      only_names_list,
 				      first_basedir,
-				      data->base_dir,
+				      data->dest_dir,
 				      data->update,
 				      data->password,
 				      data->compression);

Modified: trunk/src/gconf-utils.c
==============================================================================
--- trunk/src/gconf-utils.c	(original)
+++ trunk/src/gconf-utils.c	Tue Apr 29 08:33:58 2008
@@ -329,7 +329,7 @@
 		g_return_val_if_fail (error == NULL, result);
 		g_free (result);
 		result = g_strdup (val);
-
+		g_free (val);
 	} else if (error != NULL)
 		eel_gconf_handle_error (&error);