Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 21093:5e46cdf9ef2b | 21098:7e200a629109 |
|---|---|
| 1206 text = g_strdup_printf("You are about to send the following message:\n%s", message); | 1206 text = g_strdup_printf("You are about to send the following message:\n%s", message); |
| 1207 data = g_new0(gpointer, 2); | 1207 data = g_new0(gpointer, 2); |
| 1208 data[0] = conv; | 1208 data[0] = conv; |
| 1209 data[1] = (gpointer)message; | 1209 data[1] = (gpointer)message; |
| 1210 | 1210 |
| 1211 purple_request_action(conv, NULL, _("Send Message"), text, 0, | 1211 purple_request_action_with_hint(conv, NULL, _("Send Message"), text, 0, |
| 1212 purple_conversation_get_account(conv), NULL, conv, | 1212 purple_conversation_get_account(conv), NULL, conv, |
| 1213 data, 2, | 1213 "conversation", data, 2, |
| 1214 _("_Send Message"), G_CALLBACK(purple_conv_send_confirm_cb), | 1214 _("_Send Message"), G_CALLBACK(purple_conv_send_confirm_cb), |
| 1215 _("Cancel"), NULL); | 1215 _("Cancel"), NULL); |
| 1216 } | 1216 } |
| 1217 | 1217 |
| 1218 void | 1218 void |