diff -u xchat-2.8.6/debian/changelog xchat-2.8.6/debian/changelog --- xchat-2.8.6/debian/changelog +++ xchat-2.8.6/debian/changelog @@ -1,3 +1,11 @@ +xchat (2.8.6-4ubuntu2) karmic; urgency=low + + * debian/patches/72_fix_connect_button_underline.dpatch: + - Enable "use-underline" for connect button so that accelerator + works. (LP: #407389) + + -- Andy.Matteson Fri, 31 Jul 2009 11:20:32 -0400 + xchat (2.8.6-4ubuntu1) karmic; urgency=low * Merge from debian unstable, remaining changes: diff -u xchat-2.8.6/debian/patches/00list xchat-2.8.6/debian/patches/00list --- xchat-2.8.6/debian/patches/00list +++ xchat-2.8.6/debian/patches/00list @@ -17,2 +17,3 @@ 71_notification_icon_change +72_fix_connect_button_underline 99_gtype only in patch2: unchanged: --- xchat-2.8.6.orig/debian/patches/72_fix_connect_button_underline.dpatch +++ xchat-2.8.6/debian/patches/72_fix_connect_button_underline.dpatch @@ -0,0 +1,14 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +@DPATCH@ +diff -urNad xchat-2.8.6~/src/fe-gtk/gtkutil.c xchat-2.8.6/src/fe-gtk/gtkutil.c +--- xchat-2.8.6~/src/fe-gtk/gtkutil.c 2008-06-08 03:52:42.000000000 -0400 ++++ xchat-2.8.6/src/fe-gtk/gtkutil.c 2009-07-31 11:20:20.458493367 -0400 +@@ -376,6 +376,7 @@ + { + gtk_button_set_label (GTK_BUTTON (wid), labeltext); + gtk_button_set_image (GTK_BUTTON (wid), gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU)); ++ gtk_button_set_use_underline (GTK_BUTTON (wid), TRUE); + if (box) + gtk_container_add (GTK_CONTAINER (box), wid); + }