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

[Philippe Rouquier <philippr src gnome org>]

commit 54f7ba82b43611e53fe0099419104393bf87d0d4
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Thu May 7 18:42:50 2009 +0200

    2009-05-07  Philippe Rouquier  <bonfire-app wanadoo fr>
    
    	Fixed bgo #578970 â?? should allow all text targets, not just UTF8_STRING
    	Change the way we check whether the clipboard has some text data.
    	Thanks to Christian Persch
    
    	* libbrasero-burn/brasero-file-monitor.c
    	(brasero_file_monitor_inotify_monitor_cb):
    	* src/brasero-audio-disc.c
    	(brasero_audio_disc_clipboard_targets_cb):
    	* src/brasero-data-disc.c (brasero_data_disc_clipboard_targets_cb):
    	* src/brasero-video-disc.c
    	(brasero_video_disc_clipboard_targets_cb):
---
 ChangeLog                              |   16 +++++++++++++++-
 libbrasero-burn/brasero-file-monitor.c |    4 ++--
 src/brasero-audio-disc.c               |   25 ++++---------------------
 src/brasero-data-disc.c                |   30 ++++++------------------------
 src/brasero-video-disc.c               |   25 ++++---------------------
 5 files changed, 31 insertions(+), 69 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d5a0d61..d858637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,23 @@
 2009-05-07  Philippe Rouquier  <bonfire-app wanadoo fr>
 
+	Fixed bgo #578970 â?? should allow all text targets, not just UTF8_STRING
+	Change the way we check whether the clipboard has some text data.
+	Thanks to Christian Persch
+
+	* libbrasero-burn/brasero-file-monitor.c
+	(brasero_file_monitor_inotify_monitor_cb):
+	* src/brasero-audio-disc.c
+	(brasero_audio_disc_clipboard_targets_cb):
+	* src/brasero-data-disc.c (brasero_data_disc_clipboard_targets_cb):
+	* src/brasero-video-disc.c
+	(brasero_video_disc_clipboard_targets_cb):
+
+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.
+	Thanks to Christian Persch.
 
 	* src/brasero-audio-disc.c (brasero_audio_disc_clipboard_text_cb):
 	* src/brasero-data-disc.c (brasero_data_disc_clipboard_text_cb):
diff --git a/libbrasero-burn/brasero-file-monitor.c b/libbrasero-burn/brasero-file-monitor.c
index 97d77cc..f54873d 100644
--- a/libbrasero-burn/brasero-file-monitor.c
+++ b/libbrasero-burn/brasero-file-monitor.c
@@ -552,12 +552,12 @@ brasero_file_monitor_inotify_monitor_cb (GIOChannel *channel,
 								      &event);
 			}
 			else
-				g_warning ("Unknown (or already deleted) monitored directory = > ignored \n");
+				g_warning ("Unknown (or already deleted) monitored directory = > ignored");
 		}
 		else {
 			GSList *list;
 
-			/* This is an even happening on the top directory there*/
+			/* This is an event happening on the top directory there*/
 			list = callback_data;
 			brasero_file_monitor_inotify_file_event (self,
 								 list,
diff --git a/src/brasero-audio-disc.c b/src/brasero-audio-disc.c
index 6be7aef..ae8eb9a 100644
--- a/src/brasero-audio-disc.c
+++ b/src/brasero-audio-disc.c
@@ -3393,27 +3393,10 @@ brasero_audio_disc_clipboard_targets_cb (GtkClipboard *clipboard,
 					 gint n_atoms,
 					 BraseroAudioDisc *disc)
 {
-	GdkAtom *iter;
-
-	iter = atoms;
-	while (n_atoms > 0) {
-		gchar *target;
-
-		target = gdk_atom_name (*iter);
-
-		if (!strcmp (target, "x-special/gnome-copied-files")
-		||  !strcmp (target, "UTF8_STRING")) {
-			gtk_clipboard_request_text (clipboard,
-						    (GtkClipboardTextReceivedFunc) brasero_audio_disc_clipboard_text_cb,
-						    disc);
-			g_free (target);
-			return;
-		}
-
-		g_free (target);
-		iter++;
-		n_atoms--;
-	}
+	if (gtk_targets_include_text (atoms, n_atoms))
+		gtk_clipboard_request_text (clipboard,
+					    (GtkClipboardTextReceivedFunc) brasero_audio_disc_clipboard_text_cb,
+					    disc);
 }
 
 static void
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index 378c3f1..3fd44d5 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -400,30 +400,12 @@ brasero_data_disc_clipboard_targets_cb (GtkClipboard *clipboard,
 					gint n_atoms,
 					BraseroClipData *data)
 {
-	BraseroDataDiscPrivate *priv;
-	GdkAtom *iter;
-
-	priv = BRASERO_DATA_DISC_PRIVATE (data->disc);
-
-	iter = atoms;
-	while (n_atoms > 0) {
-		gchar *target;
-
-		target = gdk_atom_name (*iter);
-
-		if (!strcmp (target, "x-special/gnome-copied-files")
-		||  !strcmp (target, "UTF8_STRING")) {
-			gtk_clipboard_request_text (clipboard,
-						    (GtkClipboardTextReceivedFunc)
-						    brasero_data_disc_clipboard_text_cb,
-						    data);
-			g_free (target);
-			return;
-		}
-
-		g_free (target);
-		iter++;
-		n_atoms--;
+	if (gtk_targets_include_text (atoms, n_atoms)) {
+		gtk_clipboard_request_text (clipboard,
+					    (GtkClipboardTextReceivedFunc)
+					    brasero_data_disc_clipboard_text_cb,
+					    data);
+		return;
 	}
 
 	if (data->reference)
diff --git a/src/brasero-video-disc.c b/src/brasero-video-disc.c
index ba8167b..f406bd1 100644
--- a/src/brasero-video-disc.c
+++ b/src/brasero-video-disc.c
@@ -776,27 +776,10 @@ brasero_video_disc_clipboard_targets_cb (GtkClipboard *clipboard,
 					 gint n_atoms,
 					 BraseroVideoDisc *self)
 {
-	GdkAtom *iter;
-
-	iter = atoms;
-	while (n_atoms > 0) {
-		gchar *target;
-
-		target = gdk_atom_name (*iter);
-
-		if (!strcmp (target, "x-special/gnome-copied-files")
-		||  !strcmp (target, "UTF8_STRING")) {
-			gtk_clipboard_request_text (clipboard,
-						    (GtkClipboardTextReceivedFunc) brasero_video_disc_clipboard_text_cb,
-						    self);
-			g_free (target);
-			return;
-		}
-
-		g_free (target);
-		iter++;
-		n_atoms--;
-	}
+	if (gtk_targets_include_text (atoms, n_atoms))
+		gtk_clipboard_request_text (clipboard,
+					    (GtkClipboardTextReceivedFunc) brasero_video_disc_clipboard_text_cb,
+					    self);
 }
 
 static void