Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Thu May 03 22:10:19 2007 +0000 +++ b/pidgin/gtkblist.c Thu May 03 23:23:44 2007 +0000 @@ -1086,7 +1086,7 @@ prpl_info->can_receive_file(buddy->account->gc, buddy->name)) { pidgin_new_item_from_stock(menu, _("_Send File"), - PIDGIN_STOCK_FILE_TRANSFER, + PIDGIN_STOCK_TOOLBAR_SEND_FILE, G_CALLBACK(gtk_blist_menu_send_file_cb), buddy, 0, 0, NULL); } @@ -2851,7 +2851,7 @@ { 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, "<StockItem>", PIDGIN_STOCK_ABOUT }, + { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "<Item>", NULL }, }; /*********************************************************