changeset 22785:08bb9d490f38

merge of 'e238fa4987184e7ce5509bc8806f7122ad41ae6e' and 'e7903adb01a354969499931bea5fa76b55ade1ae'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 02 May 2008 01:29:34 +0000
parents 6079335eb01c (current diff) fdf60a5c2f66 (diff)
children 95308e1b47d1 7883ed211f3e
files pidgin/gtkconv.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 =