rpms/notification-daemon/devel notification-daemon-0.3.7-summary-markup.patch, NONE, 1.1 notification-daemon.spec, 1.12, 1.13

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/notification-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9005

Modified Files:
	notification-daemon.spec 
Added Files:
	notification-daemon-0.3.7-summary-markup.patch 
Log Message:
Escape markup in summaries


notification-daemon-0.3.7-summary-markup.patch:

--- NEW FILE notification-daemon-0.3.7-summary-markup.patch ---
--- notification-daemon-0.3.7/src/themes/standard/theme.c.summary-markup	2007-05-14 12:08:42.000000000 -0400
+++ notification-daemon-0.3.7/src/themes/standard/theme.c	2007-05-14 12:09:49.000000000 -0400
@@ -866,11 +866,14 @@ notification_tick(GtkWindow *nw, glong r
 void
 set_notification_text(GtkWindow *nw, const char *summary, const char *body)
 {
-	char *str;
+	char *str, *quoted;
 	WindowData *windata = g_object_get_data(G_OBJECT(nw), "windata");
 	g_assert(windata != NULL);
 
-	str = g_strdup_printf("<b><big>%s</big></b>", summary);
+	quoted = g_markup_escape_text (summary, -1);
+	str = g_strdup_printf("<b><big>%s</big></b>", quoted);
+	g_free (quoted);
+
 	gtk_label_set_markup(GTK_LABEL(windata->summary_label), str);
 	g_free(str);
 


Index: notification-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- notification-daemon.spec	24 Mar 2007 02:50:37 -0000	1.12
+++ notification-daemon.spec	14 May 2007 16:15:00 -0000	1.13
@@ -6,7 +6,7 @@
 Summary: Notification Daemon 
 Name: notification-daemon
 Version: 0.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -32,6 +32,7 @@
 
 Source0: http://www.galago-project.org/files/releases/source/notification-daemon/%{name}-%{version}.tar.bz2
 Patch0: notification-daemon-0.3.5-remove-libsexy.patch
+Patch1: notification-daemon-0.3.7-summary-markup.patch
 
 %description
 notification-daemon is the server implementation of the freedesktop.org desktop 
@@ -40,6 +41,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .remove-libsexy
+%patch1 -p1 -b .summary-markup
 
 %build
 autoreconf
@@ -91,6 +93,9 @@
 %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas
 
 %changelog
+* Mon May 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.7-2
+- Escape markup in summaries (#239950)
+
 * Fri Mar 23 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.7-1
 - Update to 0.3.7, which contains important bug fixes 
   and theming improvements