Mercurial > pidgin.yaz
changeset 15732:4ffeecc47fd3
merge of '8d6fe33f7eb88ec8510ddd2cbededff339256a04'
and 'ccb7cc3d28919dad6a4f7bd789d2dd4a11a57bf6'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 26 Feb 2007 04:40:28 +0000 |
| parents | c2f74eb8dbef (diff) 86c41495fd8f (current diff) |
| children | 326aab92ba64 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Mon Feb 26 04:39:42 2007 +0000 +++ b/COPYRIGHT Mon Feb 26 04:40:28 2007 +0000 @@ -105,6 +105,7 @@ Stefan Esser Steffen Eschenbacher Marc Etcheverry +David Everly Larry Ewing Gábor Farkas Jesse Farmer
--- a/libpurple/protocols/sametime/sametime.c Mon Feb 26 04:39:42 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Mon Feb 26 04:40:28 2007 +0000 @@ -4810,13 +4810,13 @@ msg = gaim_markup_strip_html(message); if(conf) { - ret = ! mwConference_sendText(conf, message); + ret = ! mwConference_sendText(conf, msg); } else { struct mwPlace *place = ID_TO_PLACE(pd, id); g_return_val_if_fail(place != NULL, 0); - ret = ! mwPlace_sendText(place, message); + ret = ! mwPlace_sendText(place, msg); } g_free(msg);