Mercurial > pidgin
changeset 28016:2aabf39b5581
merge of 'e8e119ae079526a36af0f2ac20e7a9c9900f44c1'
and 'fd4c0f3ddcd7c122d22e7fb569ff904e79df6ffb'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 20 Aug 2009 01:12:06 +0000 |
| parents | b289449f3e9f (current diff) cf533027c3be (diff) |
| children | 2d2856a2e7c2 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Thu Aug 20 01:11:26 2009 +0000 +++ b/pidgin/gtkconv.c Thu Aug 20 01:12:06 2009 +0000 @@ -3139,7 +3139,7 @@ { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW }, - { N_("/Conversation/Join a _Chat..."), "<CTL>C", menu_join_chat_cb, + { N_("/Conversation/Join a _Chat..."), NULL, menu_join_chat_cb, 0, "<StockItem>", PIDGIN_STOCK_CHAT }, { "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL },