Mercurial > pidgin.yaz
comparison pidgin/gtkblist.c @ 16858:9862a82206ba
merge of 'df3320af10ba54cf6129f203dedb82f35baf6800'
and 'e4f4d5a254ea26abee249a1ef3fdb5c72f3c59b2'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Thu, 03 May 2007 23:23:44 +0000 |
parents | 56823a55581a d6ccf170148e |
children | aa87ecd650d2 |
comparison
equal
deleted
inserted
replaced
16830:834e75427b1c | 16858:9862a82206ba |
---|---|
1084 if (prpl_info && prpl_info->send_file) { | 1084 if (prpl_info && prpl_info->send_file) { |
1085 if (!prpl_info->can_receive_file || | 1085 if (!prpl_info->can_receive_file || |
1086 prpl_info->can_receive_file(buddy->account->gc, buddy->name)) | 1086 prpl_info->can_receive_file(buddy->account->gc, buddy->name)) |
1087 { | 1087 { |
1088 pidgin_new_item_from_stock(menu, _("_Send File"), | 1088 pidgin_new_item_from_stock(menu, _("_Send File"), |
1089 PIDGIN_STOCK_FILE_TRANSFER, | 1089 PIDGIN_STOCK_TOOLBAR_SEND_FILE, |
1090 G_CALLBACK(gtk_blist_menu_send_file_cb), | 1090 G_CALLBACK(gtk_blist_menu_send_file_cb), |
1091 buddy, 0, 0, NULL); | 1091 buddy, 0, 0, NULL); |
1092 } | 1092 } |
1093 } | 1093 } |
1094 | 1094 |
2849 | 2849 |
2850 /* Help */ | 2850 /* Help */ |
2851 { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL }, | 2851 { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL }, |
2852 { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, | 2852 { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, |
2853 { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL }, | 2853 { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL }, |
2854 { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "<StockItem>", PIDGIN_STOCK_ABOUT }, | 2854 { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "<Item>", NULL }, |
2855 }; | 2855 }; |
2856 | 2856 |
2857 /********************************************************* | 2857 /********************************************************* |
2858 * Private Utility functions * | 2858 * Private Utility functions * |
2859 *********************************************************/ | 2859 *********************************************************/ |