Mercurial > pidgin
changeset 15730:c2f74eb8dbef
merge of '3de02ea0a320455a7d89aa8dc2ff11b30d9db1ae'
and 'ee860116b53f187b67c513cca2b6374682585482'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 26 Feb 2007 04:33:46 +0000 |
| parents | da4813f14457 (current diff) 47ca3cfedb32 (diff) |
| children | 4ffeecc47fd3 |
| files | pidgin/pixmaps/tray/16/Makefile.am pidgin/pixmaps/tray/16/tray-away.ico pidgin/pixmaps/tray/16/tray-away.png pidgin/pixmaps/tray/16/tray-busy.ico pidgin/pixmaps/tray/16/tray-busy.png pidgin/pixmaps/tray/16/tray-connecting.png pidgin/pixmaps/tray/16/tray-extended-away.ico pidgin/pixmaps/tray/16/tray-extended-away.png pidgin/pixmaps/tray/16/tray-message.ico pidgin/pixmaps/tray/16/tray-message.png pidgin/pixmaps/tray/16/tray-offline.ico pidgin/pixmaps/tray/16/tray-offline.png pidgin/pixmaps/tray/16/tray-online.ico pidgin/pixmaps/tray/16/tray-online.png |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Mon Feb 26 04:21:41 2007 +0000 +++ b/COPYRIGHT Mon Feb 26 04:33:46 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:21:41 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Mon Feb 26 04:33:46 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);