rpms/rhythmbox/F-8 rhythmbox-0.11.2-dont-escape-primary-in-notifications.patch, NONE, 1.1 rhythmbox.spec, 1.134, 1.135

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11419

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.11.2-dont-escape-primary-in-notifications.patch 
Log Message:
* Thu Oct 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.2-9
- Add patch to avoid Rhythmbox escaping the primary text in notifications
  as per the spec (#242260)


rhythmbox-0.11.2-dont-escape-primary-in-notifications.patch:

--- NEW FILE rhythmbox-0.11.2-dont-escape-primary-in-notifications.patch ---
Index: rb-shell.c
===================================================================
--- rb-shell.c	(revision 5381)
+++ rb-shell.c	(working copy)
@@ -2930,7 +2930,7 @@
 				  RhythmDBEntry *entry)
 {
 	GValue *value;
-	char *stream_title = NULL;
+	const char *stream_title = NULL;
 	char *artist = NULL;
 	char *album = NULL;
 	char *title = NULL;
@@ -2993,22 +2993,25 @@
 						       entry,
 						       RHYTHMDB_PROP_STREAM_SONG_TITLE);
 	if (value != NULL) {
-		title = markup_escape (g_value_get_string (value));
+		title = g_value_dup_string (value);
 		g_value_unset (value);
 		g_free (value);
 
-		stream_title = markup_escape (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_TITLE));
+		stream_title = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_TITLE);
 	} else {
-		title = markup_escape (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_TITLE));
+		title = g_strdup (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_TITLE));
 	}
 
 	if (stream_title != NULL && stream_title[0] != '\0') {
+		char *escaped;
+
+		escaped = markup_escape (stream_title);
 		if (secondary->len == 0)
-			g_string_append (secondary, stream_title);
+			g_string_append (secondary, escaped);
 		else
-			g_string_append_printf (secondary, " (%s)", stream_title);
+			g_string_append_printf (secondary, " (%s)", escaped);
+		g_free (escaped);
 	}
-	g_free (stream_title);
 
 	if (title != NULL)
 		shell->priv->cached_notify_primary = title;


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-8/rhythmbox.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- rhythmbox.spec	9 Oct 2007 13:38:58 -0000	1.134
+++ rhythmbox.spec	11 Oct 2007 15:39:13 -0000	1.135
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -49,6 +49,7 @@
 Patch1: rhythmbox-upnp-assert.patch
 Patch2: rhythmbox-enable-stores.patch
 Patch3: rhythmbox-0.11.2-make-gpm-plugin-work.patch
+Patch4: rhythmbox-0.11.2-dont-escape-primary-in-notifications.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -85,6 +86,9 @@
 %patch2 -p0 -b .enable-stores
 popd
 %patch3 -p1 -b .gpm-new-dbus
+pushd shell/
+%patch4 -p0 -b .notification-markup
+popd
 
 %build
 
@@ -195,6 +199,10 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Thu Oct 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.2-9
+- Add patch to avoid Rhythmbox escaping the primary text in notifications
+  as per the spec (#242260)
+
 * Tue Oct 09 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.2-8
 - Add patch to make the gnome-power-manager plugin work again
   (GNOME #483721)