# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1209744432 0
# Node ID 158dedbfd5f14fa2b8fa906f49d0e82a44e1e543
# Parent  95308e1b47d1b082b2bb9490a561a5fb9174d8e9# Parent  7883ed211f3e179d7dcf14dce8865981fb760b2e
merge of 'a5c86f336638811bfef4a0969f3d8d2d6b85520f'
     and 'ebc5ac66e700f6c67e30069ee2ebd4bb61f82ec8'

diff -r 7883ed211f3e -r 158dedbfd5f1 ChangeLog
--- a/ChangeLog	Fri May 02 06:15:33 2008 +0000
+++ b/ChangeLog	Fri May 02 16:07:12 2008 +0000
@@ -36,6 +36,9 @@
 	* The Contact Availability Prediction plugin must now be explicitly
 	  enabled.  Use the --enable-cap argument to configure to enable it.
 
+	Finch:
+	* New default binding ctrl+x to open context menus.
+
 version 2.4.1 (03/31/2008):
 	http://developer.pidgin.im/query?status=closed&milestone=2.4.1
 
diff -r 7883ed211f3e -r 158dedbfd5f1 finch/libgnt/gntwidget.c
--- a/finch/libgnt/gntwidget.c	Fri May 02 06:15:33 2008 +0000
+++ b/finch/libgnt/gntwidget.c	Fri May 02 16:07:12 2008 +0000
@@ -257,6 +257,7 @@
 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "context-menu", context_menu,
 				GNT_KEY_POPUP, NULL);
 	gnt_bindable_register_binding(GNT_BINDABLE_CLASS(klass), "context-menu", GNT_KEY_F11, NULL);
+	gnt_bindable_register_binding(GNT_BINDABLE_CLASS(klass), "context-menu", GNT_KEY_CTRL_X, NULL);
 
 	gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));
 	GNTDEBUG;