[brasero] API change remove brasero_track_data_cfg_get_contents () as it is possible to do have the same resul

[Philippe Rouquier <philippr src gnome org>]

commit 967a86a81977ccc82dc369f6baf0bcdaa8238a63
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Wed Jul 22 11:30:32 2009 +0200

    API change remove brasero_track_data_cfg_get_contents () as it is possible to do have the same result with brasero_track_data_get_grafts (), ...
    Fix a crash when in the multisession there is an autorun.inf

 libbrasero-burn/brasero-track-data-cfg.c |   32 +++++++++--------------------
 libbrasero-burn/brasero-track-data-cfg.h |    5 ----
 2 files changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index a36803c..7bbcec9 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -1365,6 +1365,9 @@ brasero_track_data_cfg_autorun_inf_parse (BraseroTrackDataCfg *track,
 
 	priv = BRASERO_TRACK_DATA_CFG_PRIVATE (track);
 
+	if (!uri)
+		return FALSE;
+
 	path = g_filename_from_uri (uri, NULL, NULL);
 	key_file = g_key_file_new ();
 
@@ -1443,13 +1446,18 @@ brasero_track_data_cfg_node_added (BraseroDataProject *project,
 		if (!strcasecmp (BRASERO_FILE_NODE_NAME (node), "autorun.inf")) {
 			gchar *uri;
 
+			
 			/* This has been added by the user or by a project so
 			 * we do display it; also we signal the change in icon.
 			 * NOTE: if we had our own autorun.inf it was wiped out
 			 * in the callback for "name-collision". */
 			uri = brasero_data_project_node_to_uri (BRASERO_DATA_PROJECT (priv->tree), node);
-			priv->icon = brasero_track_data_cfg_autorun_inf_parse (self, uri);
-			g_free (uri);
+			if (!uri) {
+				/* URI can be NULL sometimes if the autorun.inf is from
+				 * the session of the imported medium */
+				priv->icon = brasero_track_data_cfg_autorun_inf_parse (self, uri);
+				g_free (uri);
+			}
 
 			g_signal_emit (self,
 				       brasero_track_data_cfg_signals [ICON_CHANGED],
@@ -2183,26 +2191,6 @@ brasero_track_data_cfg_get_fs (BraseroTrackData *track)
 	return fs_type;
 }
 
-gboolean
-brasero_track_data_cfg_get_contents (BraseroTrackData *track,
-				     GSList **grafts,
-				     GSList **excluded)
-{
-	BraseroTrackDataCfgPrivate *priv;
-
-	g_return_val_if_fail (BRASERO_IS_TRACK_DATA_CFG (track), FALSE);
-	priv = BRASERO_TRACK_DATA_CFG_PRIVATE (track);
-
-	/* append a slash for mkisofs */
-	brasero_data_project_get_contents (BRASERO_DATA_PROJECT (priv->tree),
-					   grafts,
-					   excluded,
-					   FALSE,	/* no hidden node */
-					   FALSE,	/* no grafts for joliet incompatible nodes */
-					   FALSE);	/* no final slash for names */
-	return TRUE;
-}
-
 static GSList *
 brasero_track_data_cfg_get_grafts (BraseroTrackData *track)
 {
diff --git a/libbrasero-burn/brasero-track-data-cfg.h b/libbrasero-burn/brasero-track-data-cfg.h
index 28249eb..0b39473 100644
--- a/libbrasero-burn/brasero-track-data-cfg.h
+++ b/libbrasero-burn/brasero-track-data-cfg.h
@@ -89,11 +89,6 @@ BraseroTrackDataCfg *
 brasero_track_data_cfg_new (void);
 
 gboolean
-brasero_track_data_cfg_get_contents (BraseroTrackData *track,
-				     GSList **grafts,
-				     GSList **excluded);
-
-gboolean
 brasero_track_data_cfg_add (BraseroTrackDataCfg *track,
 			    const gchar *uri,
 			    GtkTreePath *parent);