brasero r1401 - in trunk: . src src/plugins/local-track

[philippr svn gnome org]

Author: philippr
Date: Sun Oct 19 18:06:26 2008
New Revision: 1401
URL: http://svn.gnome.org/viewvc/brasero?rev=1401&view=rev

Log:
	Fix for #547395 â Support for remote filesystems
	make local-track plugin work (sort of)

	* src/burn-caps.c (brasero_burn_caps_sort_modifiers):
	* src/plugins/local-track/burn-local-image.c
	(brasero_local_track_transfer), (_foreach_non_local_cb),
	(brasero_local_track_stop):


Modified:
   trunk/ChangeLog
   trunk/src/burn-caps.c
   trunk/src/plugins/local-track/burn-local-image.c

Modified: trunk/src/burn-caps.c
==============================================================================
--- trunk/src/burn-caps.c	(original)
+++ trunk/src/burn-caps.c	Sun Oct 19 18:06:26 2008
@@ -1190,8 +1190,8 @@
 	BraseroPlugin *plug_a = BRASERO_PLUGIN (a);
 	BraseroPlugin *plug_b = BRASERO_PLUGIN (b);
 
-	return brasero_plugin_get_priority (plug_b) -
-	       brasero_plugin_get_priority (plug_a);
+	return brasero_plugin_get_priority (plug_a) -
+	       brasero_plugin_get_priority (plug_b);
 }
 
 static GSList *

Modified: trunk/src/plugins/local-track/burn-local-image.c
==============================================================================
--- trunk/src/plugins/local-track/burn-local-image.c	(original)
+++ trunk/src/plugins/local-track/burn-local-image.c	Sun Oct 19 18:06:26 2008
@@ -278,8 +278,10 @@
 		return BRASERO_BURN_ERR;
 
 	/* Retrieve the size of all the data. */
-	if (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY)
+	if (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY) {
+		BRASERO_JOB_LOG (self, "Downloading file %lli", g_file_info_get_size (info));
 		priv->data_size = g_file_info_get_size (info);
+	}
 	else
 		brasero_local_track_get_download_size (self, src, error);
 
@@ -686,8 +688,10 @@
 	/* check that is hasn't any parent in the hash */
 	parent = g_path_get_dirname (uri);
 	while (parent [1] != '\0') {
-		localuri = g_hash_table_lookup (priv->nonlocals, parent);
-		if (localuri) {
+		gchar *uri_local;
+
+		uri_local = g_hash_table_lookup (priv->nonlocals, parent);
+		if (uri_local) {
 			g_free (parent);
 			return TRUE;
 		}
@@ -899,11 +903,13 @@
 	if (priv->src_list) {
 		g_slist_foreach (priv->src_list, (GFunc) g_object_unref, NULL);
 		g_slist_free (priv->src_list);
+		priv->src_list = NULL;
 	}
 
 	if (priv->dest_list) {
 		g_slist_foreach (priv->dest_list, (GFunc) g_object_unref, NULL);
 		g_slist_free (priv->dest_list);
+		priv->dest_list = NULL;
 	}
 
 	if (priv->nonlocals) {