=== modified file 'debian/changelog'
--- debian/changelog	2009-02-27 22:02:48 +0000
+++ debian/changelog	2009-03-19 14:16:06 +0000
@@ -1,3 +1,12 @@
+xchat (2.8.6-2.1ubuntu4) jaunty; urgency=low
+
+  * debian/patches/71_notification_icon_change.dpatch switch to using
+    the nicer icon for notifications. (LP: #345472)
+  * debian/patches/70_notification_strings_shorten.dpatch to make the
+    notification strings much shorter for cleaner notifications.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 19 Mar 2009 09:15:32 -0500
+
 xchat (2.8.6-2.1ubuntu3) jaunty; urgency=low
 
   * debian/patches/02_ubuntu_default_server.dpatch: select "Ubuntu servers" by

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2009-02-27 22:02:48 +0000
+++ debian/patches/00list	2009-03-13 12:36:35 +0000
@@ -12,4 +12,6 @@
 50_xc286_smallfixes.dpatch
 60_gtktype_removal.dpatch
 46_CVE-2009-0315
+70_notification_strings_shorten.dpatch
+71_notification_icon_change.dpatch
 

=== added file 'debian/patches/70_notification_strings_shorten.dpatch'
--- debian/patches/70_notification_strings_shorten.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/70_notification_strings_shorten.dpatch	2009-03-13 12:21:42 +0000
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+=== modified file 'src/fe-gtk/plugin-tray.c'
+--- old/src/fe-gtk/plugin-tray.c	2008-10-31 17:46:48 +0000
++++ new/src/fe-gtk/plugin-tray.c	2009-03-13 12:06:32 +0000
+@@ -653,7 +653,7 @@
+ 	}
+ 
+ 	if (prefs.input_balloon_hilight)
+-		tray_set_balloonf (word[2], _("XChat: Highlighted message from: %s (%s)"),
++		tray_set_balloonf (word[2], _("%s (%s)"),
+ 								 word[1], xchat_get_info (ph, "channel"));
+ 
+ 	return XCHAT_EAT_NONE;
+@@ -678,8 +678,8 @@
+ 	}
+ 
+ 	if (prefs.input_balloon_chans)
+-		tray_set_balloonf (word[2], _("XChat: New public message from: %s (%s)"),
+-								 word[1], xchat_get_info (ph, "channel"));
++		tray_set_balloonf (word[2], _("%s (%s)"),
++								 word[1], xchat_get_info(ph, "channel"));
+ 
+ 	return XCHAT_EAT_NONE;
+ }
+@@ -707,8 +707,8 @@
+ 							tray_priv_count, from, network);
+ 
+ 	if (prefs.input_balloon_priv)
+-		tray_set_balloonf (text, _("XChat: Private message from: %s (%s)"),
+-								 from, network);
++		tray_set_balloonf (text, 
++								 from);
+ }
+ 
+ static int
+@@ -761,8 +761,8 @@
+ 	}
+ 
+ 	if (prefs.input_balloon_priv)
+-		tray_set_balloonf ("", _("XChat: File offer from: %s (%s)"),
+-								word[1], network);
++		tray_set_balloonf (_("is offering you a file."),
++								word[1]);
+ 
+ 	return XCHAT_EAT_NONE;
+ }
+

=== added file 'debian/patches/71_notification_icon_change.dpatch'
--- debian/patches/71_notification_icon_change.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/71_notification_icon_change.dpatch	2009-03-19 15:43:02 +0000
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+=== modified file 'src/fe-gtk/plugin-tray.c'
+--- old/src/fe-gtk/plugin-tray.c	2009-03-13 12:08:06 +0000
++++ new/src/fe-gtk/plugin-tray.c	2009-03-13 14:43:32 +0000
+@@ -174,7 +174,7 @@
+ 
+ 	text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
+ 	title = strip_color (title, -1, STRIP_ALL);
+-	noti = nn_new (title, text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
++	noti = nn_new (title, text, "notification-message-im", NULL);
+ 	g_free ((char *)title);
+ 	g_free ((char *)text);
+ 
+@@ -225,9 +225,7 @@
+ 	{
+ 		argv[0] = path;
+ 		argv[1] = "-i";
+-		argv[2] = "gtk-dialog-info";
+-		if (access (XCHATSHAREDIR"/pixmaps/xchat.png", R_OK) == 0)
+-			argv[2] = XCHATSHAREDIR"/pixmaps/xchat.png";
++		argv[2] = "notification-message-im";
+ 		argv[3] = "-t";
+ 		argv[4] = "20000";
+ 		argv[5] = title;
+