brasero r2018 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Fri Feb 27 19:51:31 2009
New Revision: 2018
URL: http://svn.gnome.org/viewvc/brasero?rev=2018&view=rev

Log:
2009-02-27  Philippe Rouquier  <bonfire-app wanadoo fr>

	Fix infinite loop on FreeBSD where dirname () implementation is different
	Patch by Joe Marcus Clarke
	Mentionned in #567822 â Can't blank DVD on FreeBSD

	* src/brasero-data-project.c (brasero_data_project_uri_to_nodes),
	(brasero_data_project_uri_has_parent),
	(brasero_data_project_uri_is_graft_needed),
	(brasero_data_project_add_excluded_uri):

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	Fri Feb 27 19:51:31 2009
@@ -547,7 +547,7 @@
 		if (graft)
 			break;
 
-		dirname (parent);
+		parent = dirname (parent);
 	}
 
 	if (!graft) {
@@ -723,7 +723,7 @@
 			return TRUE;
 		}
 
-		dirname (parent);
+		parent = dirname (parent);
 	}
 
 	g_free (parent);
@@ -797,7 +797,7 @@
 	 * node is missing. */
 	graft_parent = g_hash_table_lookup (priv->grafts, parent);
 	while (parent && !graft_parent) {
-		dirname (parent);
+		parent = dirname (parent);
 		graft_parent = g_hash_table_lookup (priv->grafts, parent);
 	}
 	g_free (parent);
@@ -2723,7 +2723,7 @@
 			break;
 
 		graft = NULL;
-		dirname (parent_uri);
+		parent_uri = dirname (parent_uri);
 	}
 	g_free (parent_uri);