diff -u notification-daemon-0.3.7/debian/changelog notification-daemon-0.3.7/debian/changelog --- notification-daemon-0.3.7/debian/changelog +++ notification-daemon-0.3.7/debian/changelog @@ -1,3 +1,11 @@ +notification-daemon (0.3.7-1ubuntu10) hardy; urgency=low + + * 01_ubuntu_theme.patch: + - Fixed the summary text label to escape summary text. It's not + Pango markup by specification. + + -- Alex Jones Tue, 11 Dec 2007 17:23:46 +0000 + notification-daemon (0.3.7-1ubuntu9) hardy; urgency=low * 01_ubuntu_theme.patch: diff -u notification-daemon-0.3.7/debian/patches/01_ubuntu_theme.patch notification-daemon-0.3.7/debian/patches/01_ubuntu_theme.patch --- notification-daemon-0.3.7/debian/patches/01_ubuntu_theme.patch +++ notification-daemon-0.3.7/debian/patches/01_ubuntu_theme.patch @@ -1,6 +1,6 @@ -diff -Nur ubuntu/configure.ac ubuntu.new/configure.ac ---- ubuntu/configure.ac 2007-02-28 00:16:16.000000000 -0500 -+++ ubuntu.new/configure.ac 2007-11-01 11:18:32.000000000 -0400 +diff -Nur -x '*.orig' -x '*~' notification-daemon-0.3.7/configure.ac notification-daemon-0.3.7.new/configure.ac +--- notification-daemon-0.3.7/configure.ac 2007-02-28 05:16:16.000000000 +0000 ++++ notification-daemon-0.3.7.new/configure.ac 2007-12-11 17:11:46.000000000 +0000 @@ -174,6 +174,7 @@ src/themes/Makefile src/themes/bubble/Makefile @@ -9,17 +9,17 @@ ]) AC_OUTPUT -diff -Nur ubuntu/src/themes/Makefile.am ubuntu.new/src/themes/Makefile.am ---- ubuntu/src/themes/Makefile.am 2006-10-08 17:04:02.000000000 -0400 -+++ ubuntu.new/src/themes/Makefile.am 2007-11-01 11:18:32.000000000 -0400 +diff -Nur -x '*.orig' -x '*~' notification-daemon-0.3.7/src/themes/Makefile.am notification-daemon-0.3.7.new/src/themes/Makefile.am +--- notification-daemon-0.3.7/src/themes/Makefile.am 2006-10-08 22:04:02.000000000 +0100 ++++ notification-daemon-0.3.7.new/src/themes/Makefile.am 2007-12-11 17:11:46.000000000 +0000 @@ -1,2 +1,2 @@ -SUBDIRS = standard -DIST_SUBDIRS = $(SUBDIRS) bubble +SUBDIRS = standard ubuntu +DIST_SUBDIRS = $(SUBDIRS) bubble ubuntu -diff -Nur ubuntu/src/themes/ubuntu/Makefile.am ubuntu.new/src/themes/ubuntu/Makefile.am ---- ubuntu/src/themes/ubuntu/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -+++ ubuntu.new/src/themes/ubuntu/Makefile.am 2007-11-01 11:18:32.000000000 -0400 +diff -Nur -x '*.orig' -x '*~' notification-daemon-0.3.7/src/themes/ubuntu/Makefile.am notification-daemon-0.3.7.new/src/themes/ubuntu/Makefile.am +--- notification-daemon-0.3.7/src/themes/ubuntu/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ notification-daemon-0.3.7.new/src/themes/ubuntu/Makefile.am 2007-12-11 17:11:46.000000000 +0000 @@ -0,0 +1,9 @@ +enginedir = $(libdir)/notification-daemon-1.0/engines + @@ -30,9 +30,9 @@ +libubuntu_la_LIBADD = $(NOTIFICATION_DAEMON_LIBS) + +INCLUDES = $(NOTIFICATION_DAEMON_CFLAGS) -diff -Nur ubuntu/src/themes/ubuntu/theme.c ubuntu.new/src/themes/ubuntu/theme.c ---- ubuntu/src/themes/ubuntu/theme.c 1969-12-31 19:00:00.000000000 -0500 -+++ ubuntu.new/src/themes/ubuntu/theme.c 2007-11-01 11:19:39.000000000 -0400 +diff -Nur -x '*.orig' -x '*~' notification-daemon-0.3.7/src/themes/ubuntu/theme.c notification-daemon-0.3.7.new/src/themes/ubuntu/theme.c +--- notification-daemon-0.3.7/src/themes/ubuntu/theme.c 1970-01-01 01:00:00.000000000 +0100 ++++ notification-daemon-0.3.7.new/src/themes/ubuntu/theme.c 2007-12-11 17:18:24.000000000 +0000 @@ -0,0 +1,861 @@ +#include "config.h" + @@ -527,7 +527,7 @@ + WindowData *windata = g_object_get_data(G_OBJECT(nw), "windata"); + g_assert(windata != NULL); + -+ str = g_strdup_printf("%s", summary); ++ str = g_markup_printf_escaped("%s", summary); + gtk_label_set_markup(GTK_LABEL(windata->summary_label), str); + g_free(str); +