# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1172464828 0
# Node ID 4ffeecc47fd3d5497430b79c7bb4dc52c04e56f7
# Parent  c2f74eb8dbefea1889180d55245484c2224de823# Parent  86c41495fd8f2210e757d387e93c21972473c5dd
merge of '8d6fe33f7eb88ec8510ddd2cbededff339256a04'
     and 'ccb7cc3d28919dad6a4f7bd789d2dd4a11a57bf6'

diff -r 86c41495fd8f -r 4ffeecc47fd3 COPYRIGHT
--- 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
diff -r 86c41495fd8f -r 4ffeecc47fd3 libpurple/protocols/sametime/sametime.c
--- 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);