# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1172464426 0
# Node ID c2f74eb8dbefea1889180d55245484c2224de823
# Parent  da4813f14457641a22043c9bbc725e46fabdbb98# Parent  47ca3cfedb3274d4f42b3976db42436ae403af4a
merge of '3de02ea0a320455a7d89aa8dc2ff11b30d9db1ae'
     and 'ee860116b53f187b67c513cca2b6374682585482'

diff -r da4813f14457 -r c2f74eb8dbef COPYRIGHT
--- 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
diff -r da4813f14457 -r c2f74eb8dbef libpurple/protocols/sametime/sametime.c
--- 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);