[brasero] 2009-05-07 Philippe Rouquier <bonfire-app wanadoo fr>

[Philippe Rouquier <philippr src gnome org>]

commit ca9f782ae198b8e3032695ccff54b2e22f27d392
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Thu May 7 12:14:41 2009 +0200

    2009-05-07  Philippe Rouquier  <bonfire-app wanadoo fr>
    
    	Fixed bgo #578977 â?? use g_uri_list_extract_uris
    	Change the way we retrieve the array of Uris and also fixed a memleak
    	in brasero-audio-disc.c and brasero-video-disc.c (in the same functions).
    	Thanks to Christian Perch.
    
    	* src/brasero-audio-disc.c (brasero_audio_disc_clipboard_text_cb):
    	* src/brasero-data-disc.c (brasero_data_disc_clipboard_text_cb):
    	* src/brasero-video-disc.c (brasero_video_disc_clipboard_text_cb):
---
 ChangeLog                |   11 +++++++++++
 src/brasero-audio-disc.c |    6 +++++-
 src/brasero-data-disc.c  |    8 +++++++-
 src/brasero-video-disc.c |    6 +++++-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 43371da..d5a0d61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-05-07  Philippe Rouquier  <bonfire-app wanadoo fr>
 
+	Fixed bgo #578977 â?? use g_uri_list_extract_uris
+	Change the way we retrieve the array of Uris and also fixed a memleak
+	in brasero-audio-disc.c and brasero-video-disc.c (in the same functions).
+	Thanks to Christian Perch.
+
+	* src/brasero-audio-disc.c (brasero_audio_disc_clipboard_text_cb):
+	* src/brasero-data-disc.c (brasero_data_disc_clipboard_text_cb):
+	* src/brasero-video-disc.c (brasero_video_disc_clipboard_text_cb):
+
+2009-05-07  Philippe Rouquier  <bonfire-app wanadoo fr>
+
 	Fix 578959 â?? brasero crashed with SIGSEGV in g_closure_invoke()
 	Check nb_atoms is > 0.
 
diff --git a/src/brasero-audio-disc.c b/src/brasero-audio-disc.c
index 038507f..6be7aef 100644
--- a/src/brasero-audio-disc.c
+++ b/src/brasero-audio-disc.c
@@ -3357,7 +3357,10 @@ brasero_audio_disc_clipboard_text_cb (GtkClipboard *clipboard,
 	gchar **array;
 	gchar **item;
 
-	array = g_strsplit_set (text, "\n\r", 0);
+	if (!text)
+		return;
+
+	array = g_uri_list_extract_uris (text);
 	item = array;
 	while (*item) {
 		if (**item != '\0') {
@@ -3381,6 +3384,7 @@ brasero_audio_disc_clipboard_text_cb (GtkClipboard *clipboard,
 
 		item++;
 	}
+	g_strfreev (array);
 }
 
 static void
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index 0ea1932..378c3f1 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -353,12 +353,15 @@ brasero_data_disc_clipboard_text_cb (GtkClipboard *clipboard,
 	gchar **array;
 	gchar **item;
 
+	if (!text)
+		goto end;
+
 	priv = BRASERO_DATA_DISC_PRIVATE (data->disc);
 
 	if (data->reference)
 		parent = gtk_tree_row_reference_get_path (data->reference);
 
-	array = g_strsplit_set (text, "\n\r", 0);
+	array = g_uri_list_extract_uris (text);
 	item = array;
 	while (*item) {
 		if (**item != '\0') {
@@ -382,6 +385,9 @@ brasero_data_disc_clipboard_text_cb (GtkClipboard *clipboard,
 	}
 	g_strfreev (array);
 
+
+end:
+
 	if (data->reference)
 		gtk_tree_row_reference_free (data->reference);
 
diff --git a/src/brasero-video-disc.c b/src/brasero-video-disc.c
index 01d4b9a..ba8167b 100644
--- a/src/brasero-video-disc.c
+++ b/src/brasero-video-disc.c
@@ -742,7 +742,10 @@ brasero_video_disc_clipboard_text_cb (GtkClipboard *clipboard,
 	gchar **array;
 	gchar **item;
 
-	array = g_strsplit_set (text, "\n\r", 0);
+	if (!text)
+		return;
+
+	array = g_uri_list_extract_uris (text);
 	item = array;
 	while (*item) {
 		if (**item != '\0') {
@@ -764,6 +767,7 @@ brasero_video_disc_clipboard_text_cb (GtkClipboard *clipboard,
 
 		item++;
 	}
+	g_strfreev (array);
 }
 
 static void