pidgin: cece1665: Change the Set User Mood shortcut to Con...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: cece16657e35bbb1f4e5b1654fd66e358ca907fd
Parent:   f017dfe4ac05cbdbbca6617a1c602da0c89425a2
Author:   qulogic at pidgin.im
Date:     08/29/10 19:28:46
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cece16657e35bbb1f4e5b1654fd66e358ca907fd

Changelog: 

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.

Changes against parent f017dfe4ac05cbdbbca6617a1c602da0c89425a2

  patched  ChangeLog
  patched  pidgin/gtkblist.c

-------------- next part --------------
============================================================
--- ChangeLog	66347fa7e6fbbc0bc4f287c6d14612e2744dc95a
+++ ChangeLog	6fc5a56629f0377fe815b646fe3d4df27531c60b
@@ -11,6 +11,11 @@ version 2.7.4 (MM/DD/YYYY):
 	  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
============================================================
--- pidgin/gtkblist.c	9a943894b7e1a3d8e5b58e179970f160779f7493
+++ pidgin/gtkblist.c	849ad4c8761af32a534733bd3124544c69978fd6
@@ -3689,7 +3689,7 @@ static GtkItemFactoryEntry blist_menu[] 
 	{ 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 },