rpms/empathy/F-12 escape-notifications.patch, NONE, 1.1 empathy.spec, 1.86, 1.87

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23218

Modified Files:
	empathy.spec 
Added Files:
	escape-notifications.patch 
Log Message:
Add an upstream fix


escape-notifications.patch:
 empathy-status-icon.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE escape-notifications.patch ---
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 3af060a..f1fe6bc 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -155,17 +155,19 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 
 	if (priv->event) {
 		gchar *message_esc = NULL;
+		gchar *header_esc = NULL;
 
 		if (priv->event->message != NULL)
 			message_esc = g_markup_escape_text (priv->event->message, -1);
+			header_esc = g_markup_escape_text (priv->event->header, -1);
 
 		if (priv->notification) {
 			notify_notification_update (priv->notification,
-						    priv->event->header, message_esc,
+						    header_esc, message_esc,
 						    NULL);
 		} else {
 			priv->notification = notify_notification_new_with_status_icon
-				(priv->event->header, message_esc, NULL, priv->icon);
+				(header_esc, message_esc, NULL, priv->icon);
 			notify_notification_set_timeout (priv->notification,
 							 NOTIFY_EXPIRES_DEFAULT);
 
@@ -194,6 +196,7 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 		notify_notification_show (priv->notification, NULL);
 
 		g_free (message_esc);
+		g_free (header_esc);
 	} else {
 		notification_close_helper (priv);
 	}



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- empathy.spec	26 Oct 2009 21:54:39 -0000	1.86
+++ empathy.spec	29 Oct 2009 23:11:50 -0000	1.87
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,6 +33,8 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
+# upstream fix
+Patch6:         escape-notifications.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -137,6 +139,7 @@ bindings to the libempathy and libempath
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
 %patch5 -p1 -b .nm
+%patch6 -p1 -b .escape-notifications
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -237,6 +240,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1.1-3
+- Escape notifications
+
 * Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-2
 - Disable panel applets, since they are unmaintained and being dropped from Empathy.