Mercurial > pidgin
diff libpurple/conversation.c @ 21098:7e200a629109
explicit merge of '8f24e3576448fefbc861e06f1e8d5fe17db2e71a'
and '49d0219884ede2c6c571f2df73e29dffa86f54ad'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 14 Oct 2007 02:13:14 +0000 |
| parents | 285bb637a2b7 |
| children | 8c9aad9479c0 0b67d509a305 |
line wrap: on
line diff
--- a/libpurple/conversation.c Sat Oct 13 23:26:48 2007 +0000 +++ b/libpurple/conversation.c Sun Oct 14 02:13:14 2007 +0000 @@ -1208,9 +1208,9 @@ data[0] = conv; data[1] = (gpointer)message; - purple_request_action(conv, NULL, _("Send Message"), text, 0, + purple_request_action_with_hint(conv, NULL, _("Send Message"), text, 0, purple_conversation_get_account(conv), NULL, conv, - data, 2, + "conversation", data, 2, _("_Send Message"), G_CALLBACK(purple_conv_send_confirm_cb), _("Cancel"), NULL); }