# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1209691774 0
# Node ID 08bb9d490f3802bed0f87df1483853ec40cbb067
# Parent  6079335eb01c0349576896a184736623eb9730e0# Parent  fdf60a5c2f66601c4ad1c42a9e915cb1e0be36aa
merge of 'e238fa4987184e7ce5509bc8806f7122ad41ae6e'
     and 'e7903adb01a354969499931bea5fa76b55ade1ae'

diff -r 6079335eb01c -r 08bb9d490f38 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Fri May 02 01:28:43 2008 +0000
+++ b/pidgin/gtkconv.c	Fri May 02 01:29:34 2008 +0000
@@ -3052,7 +3052,7 @@
 	{ N_("/Options/Enable _Sounds"), NULL, menu_sounds_cb, 0, "<CheckItem>", NULL },
 	{ "/Options/sep0", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Options/Show Formatting _Toolbars"), NULL, menu_toolbar_cb, 0, "<CheckItem>", NULL },
-	{ N_("/Options/Show Ti_mestamps"), "F2", menu_timestamps_cb, 0, "<CheckItem>", NULL },
+	{ N_("/Options/Show Ti_mestamps"), NULL, menu_timestamps_cb, 0, "<CheckItem>", NULL },
 };
 
 static const int menu_item_count =