Mercurial > pidgin.yaz
changeset 30892:c8d6a2cc3bfe
Change the Set User Mood shortcut to Control+D. Control+O is in use
to open the Buddy Info for the selected user.
Refs #12166.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sun, 29 Aug 2010 23:28:46 +0000 |
parents | 7daf9b3c07ae |
children | 80affba7ea0d |
files | ChangeLog pidgin/gtkblist.c |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Aug 29 23:25:47 2010 +0000 +++ b/ChangeLog Sun Aug 29 23:28:46 2010 +0000 @@ -11,6 +11,11 @@ request with an icon. Fixes receiving MSN file transfer requests including a thumbnail in Finch. + Pidgin: + * Remap the "Set User Mood" shortcut to Control+D which does not + conflict with the previous shortcut to Get Buddy Info on the + selected buddy. + Yahoo/Yahoo JAPAN: * Stop doing unnecessary lookups of certain alias information. This solves deadlocks when a given Yahoo account has a ridiculously large
--- a/pidgin/gtkblist.c Sun Aug 29 23:25:47 2010 +0000 +++ b/pidgin/gtkblist.c Sun Aug 29 23:28:46 2010 +0000 @@ -3689,7 +3689,7 @@ { N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 2, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS }, { N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES }, { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL }, - { N_("/Tools/Set _Mood"), "<CTL>O", set_mood_show, 0, "<Item>", NULL }, + { N_("/Tools/Set _Mood"), "<CTL>D", set_mood_show, 0, "<Item>", NULL }, { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER }, { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },