Mercurial > pidgin.yaz
changeset 25476:6cbc4478977b
merge of '6ede43d45490ec8d91a1bf2f5877b461519b474b'
and 'e21158cc8e22e73a3703ee15a65535114427a105'
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Wed, 02 May 2007 19:01:24 +0000 |
| parents | 3b014d70e7c9 (diff) 5eca30c2935b (current diff) |
| children | bf4af6a6da6a |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Wed May 02 12:23:38 2007 +0000 +++ b/pidgin/gtkconv.c Wed May 02 19:01:24 2007 +0000 @@ -2775,7 +2775,7 @@ #if ENABLE_SHORTCUT { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR }, #else - { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", menu_clear_cb, 0, "<Item>" }, + { N_("/Conversation/Clea_r Scrollback"), NULL, menu_clear_cb, 0, "<Item>" }, #endif { "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL },