brasero r1399 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sun Oct 19 13:56:40 2008
New Revision: 1399
URL: http://svn.gnome.org/viewvc/brasero?rev=1399&view=rev

Log:
	minor cleanup

	* src/brasero-data-project.c (brasero_data_project_node_loaded),
	(brasero_data_project_add_node_from_info):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-data-project.c

Modified: trunk/src/brasero-data-project.c
==============================================================================
--- trunk/src/brasero-data-project.c	(original)
+++ trunk/src/brasero-data-project.c	Sun Oct 19 13:56:40 2008
@@ -1877,8 +1877,9 @@
 		brasero_data_project_exclude_uri (self, uri);
 		g_free (uri);
 
-		/* NOTE: info has the uri for the target of the symlink */
-		graft = brasero_data_project_uri_ensure_graft (self, g_file_info_get_symlink_target (info));
+		/* NOTE: info has the uri for the target of the symlink.
+		 * NOTE 2: all nodes with target URI become grafted. */
+		graft = brasero_data_project_uri_graft_nodes (self, g_file_info_get_symlink_target (info));
 		brasero_file_node_graft (node, graft);
 	}
 
@@ -2113,12 +2114,8 @@
 
 	node = brasero_file_node_new_from_info (info, parent, priv->sort_func);
 	if (node->is_symlink) {
-		gchar *symlink_uri;
-
 		/* first we exclude the symlink, then we graft its target */
-		symlink_uri = brasero_data_project_node_to_uri (self, node);
-		brasero_data_project_exclude_uri (self, symlink_uri);
-		g_free (symlink_uri);
+		brasero_data_project_exclude_uri (self, uri);
 
 		/* then we add the node */
 		brasero_data_project_add_node_real (self,
@@ -2127,7 +2124,10 @@
 						    g_file_info_get_symlink_target (info));
 	}
 	else
-		brasero_data_project_add_node_real (self, node, graft, uri);
+		brasero_data_project_add_node_real (self,
+						    node,
+						    graft,
+						    uri);
 
 	if (type != G_FILE_TYPE_DIRECTORY)
 		g_signal_emit (self,