# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1183259743 0
# Node ID 238086459dc48be40365875c4cc9a0d1895346e6
# Parent  3c6bc8785af91ffecd25a4da5096d15cb79f2a01# Parent  ceaa0940bfd642e09cd5c0fc5115a61625e2e57a
propagate from branch 'im.pidgin.pidgin' (head 98416e917a1165a4df7eb5839840348ff4c17bf2)
            to branch 'org.maemo.garage.pidgin.pidgin.about-menu-icon' (head d8a42ed758757ffa01f3dbf8dd6ec2a33d4b3891)

diff -r 3c6bc8785af9 -r 238086459dc4 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sun Jul 01 01:54:25 2007 +0000
+++ b/pidgin/gtkblist.c	Sun Jul 01 03:15:43 2007 +0000
@@ -2873,7 +2873,11 @@
 	{ N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
 	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
+#if GTK_CHECK_VERSION(2,6,0)	
+	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0,  "<StockItem>", GTK_STOCK_ABOUT },
+#else
 	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0,  "<Item>", NULL },
+#endif
 };
 
 /*********************************************************