Mercurial > pidgin
changeset 17640:5b428a69d986
merge of '192e968410effe18dde7b924122f845eb1db3d2d'
and '3d0bbd7118292e82211bcb2be3abf0f867a8b5ed'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Fri, 15 Jun 2007 02:01:42 +0000 |
| parents | 392889212240 (current diff) 0bbc08d41234 (diff) |
| children | 9e0aec946cd0 |
| files | libpurple/protocols/bonjour/dns_sd.c libpurple/protocols/bonjour/dns_sd.h pidgin/gtkblist.c pidgin/pixmaps/emotes/default/22/theme pidgin/pixmaps/emotes/none/theme |
| diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Fri Jun 15 01:54:23 2007 +0000 +++ b/pidgin/gtkblist.c Fri Jun 15 02:01:42 2007 +0000 @@ -496,6 +496,11 @@ pidgin_syslog_show(); } +static void gtk_blist_show_onlinehelp_cb() +{ + purple_notify_uri(NULL, PURPLE_WEBSITE "documentation.php"); +} + static void do_join_chat(PidginJoinChatData *data) { @@ -2859,7 +2864,6 @@ { N_("/Buddies/Add C_hat..."), NULL, pidgin_blist_add_chat_cb, 0, "<StockItem>", GTK_STOCK_ADD }, { N_("/Buddies/Add _Group..."), NULL, purple_blist_request_add_group, 0, "<StockItem>", GTK_STOCK_ADD }, { "/Buddies/sep3", NULL, NULL, 0, "<Separator>", NULL }, - { N_("/Buddies/_About Pidgin"), NULL, pidgin_dialogs_about, 0, "<Item>", NULL }, { N_("/Buddies/_Quit"), "<CTL>Q", purple_core_quit, 0, "<StockItem>", GTK_STOCK_QUIT }, /* Accounts menu */ @@ -2876,9 +2880,14 @@ { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL }, { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL }, { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<Item>", NULL }, - { N_("/Tools/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL }, { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, + + /* Help */ + { 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 }, + { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "<Item>", NULL }, }; /*********************************************************