Mercurial > pidgin.yaz
changeset 18402:238086459dc4
propagate from branch 'im.pidgin.pidgin' (head 98416e917a1165a4df7eb5839840348ff4c17bf2)
to branch 'org.maemo.garage.pidgin.pidgin.about-menu-icon' (head d8a42ed758757ffa01f3dbf8dd6ec2a33d4b3891)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 01 Jul 2007 03:15:43 +0000 |
| parents | 3c6bc8785af9 (current diff) ceaa0940bfd6 (diff) |
| children | 8ee1f173253c 162a767a20d4 |
| files | libpurple/protocols/bonjour/dns_sd.c libpurple/protocols/bonjour/dns_sd.h libpurple/protocols/qq/group_misc.c libpurple/protocols/qq/group_misc.h pidgin/gtkblist.c |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 }; /*********************************************************