comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 16881
- e6bca9e3d85c
- parent 16856
- 3e42fed1dd43
- child 16977
- c9cb49bea66d
equal
deleted
inserted
replaced
| 16880:c8586abdc739 | 16881:e6bca9e3d85c |
|---|---|
| 1577 | 1577 |
| 1578 | 1578 |
| 1579 if (prpl_info && prpl_info->send_file) | 1579 if (prpl_info && prpl_info->send_file) |
| 1580 { | 1580 { |
| 1581 button = pidgin_new_item_from_stock(menu, _("Send File"), | 1581 button = pidgin_new_item_from_stock(menu, _("Send File"), |
| 1582 PIDGIN_STOCK_FILE_TRANSFER, G_CALLBACK(menu_chat_send_file_cb), | 1582 PIDGIN_STOCK_TOOLBAR_SEND_FILE, G_CALLBACK(menu_chat_send_file_cb), |
| 1583 PIDGIN_CONVERSATION(conv), 0, 0, NULL); | 1583 PIDGIN_CONVERSATION(conv), 0, 0, NULL); |
| 1584 | 1584 |
| 1585 if (gc == NULL || prpl_info == NULL || | 1585 if (gc == NULL || prpl_info == NULL || |
| 1586 !(!prpl_info->can_receive_file || prpl_info->can_receive_file(gc, who))) | 1586 !(!prpl_info->can_receive_file || prpl_info->can_receive_file(gc, who))) |
| 1587 { | 1587 { |
| 2765 "<StockItem>", GTK_STOCK_SAVE_AS }, | 2765 "<StockItem>", GTK_STOCK_SAVE_AS }, |
| 2766 { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR }, | 2766 { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR }, |
| 2767 | 2767 |
| 2768 { "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL }, | 2768 { "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL }, |
| 2769 | 2769 |
| 2770 { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_FILE_TRANSFER }, | 2770 { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE }, |
| 2771 { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, | 2771 { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, |
| 2772 0, "<Item>", NULL }, | 2772 0, "<Item>", NULL }, |
| 2773 { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0, | 2773 { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0, |
| 2774 "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO }, | 2774 "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO }, |
| 2775 { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, | 2775 { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, |
