Mercurial > pidgin.yaz
comparison pidgin/gtkimhtmltoolbar.c @ 21353:8ae227dca885
merge of '00bf7296307f96f5c68d6e5edf219fb4a50bb947'
and '3468b1f73a715bd59ad22726232214da77cf67f7'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 16 Nov 2007 23:27:07 +0000 |
| parents | 0cb8d5304f4f 73c5f5bfeb39 |
| children | fcb848b2d669 |
comparison
equal
deleted
inserted
replaced
| 21352:ca17c133d6c3 | 21353:8ae227dca885 |
|---|---|
| 432 msg, | 432 msg, |
| 433 fields, | 433 fields, |
| 434 _("_Insert"), G_CALLBACK(do_insert_link_cb), | 434 _("_Insert"), G_CALLBACK(do_insert_link_cb), |
| 435 _("Cancel"), G_CALLBACK(cancel_link_cb), | 435 _("Cancel"), G_CALLBACK(cancel_link_cb), |
| 436 NULL, NULL, NULL, | 436 NULL, NULL, NULL, |
| 437 PURPLE_REQUEST_HINT_CONV, toolbar); | 437 "conversation", toolbar); |
| 438 g_free(msg); | 438 g_free(msg); |
| 439 g_free(desc); | 439 g_free(desc); |
| 440 } else { | 440 } else { |
| 441 close_link_dialog(toolbar); | 441 close_link_dialog(toolbar); |
| 442 } | 442 } |