# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1132325839 0
# Node ID e09bf5bc81d8eee074208ffdfeb96db6c2b338a0
# Parent  9f34340f244555acbfb1a2358d50d38bd9cd1612
[gaim-migrate @ 14435]
Uh...

committer: Tailor Script <tailor@pidgin.im>

diff -r 9f34340f2445 -r e09bf5bc81d8 src/protocols/sametime/sametime.c
--- a/src/protocols/sametime/sametime.c	Fri Nov 18 14:49:47 2005 +0000
+++ b/src/protocols/sametime/sametime.c	Fri Nov 18 14:57:19 2005 +0000
@@ -1682,8 +1682,8 @@
   GaimAccount *acct;
   GaimConversation *conv;
   GaimBuddy *buddy;
-  char *who = from->user_id;
-  char *msg;
+  const char *who = from->user_id;
+  char *tmp, *msg;
   
   pd = mwSession_getClientData(s);
   acct = gaim_connection_get_account(pd->gc);
@@ -1692,14 +1692,14 @@
 
   buddy = gaim_find_buddy(acct, who);
   if(buddy) {
-    who = g_strdup(gaim_buddy_get_contact_alias(buddy));
+    who = gaim_buddy_get_contact_alias(buddy);
   }
 
-  who = g_strdup_printf(_("Announcement from %s"), who);
+  tmp = g_strdup_printf(_("Announcement from %s"), who);
   msg = gaim_markup_linkify(text);
 
-  gaim_conversation_write(conv, who, msg, GAIM_MESSAGE_RECV, time(NULL));
-  g_free(who);
+  gaim_conversation_write(conv, tmp, msg, GAIM_MESSAGE_RECV, time(NULL));
+  g_free(tmp);
   g_free(msg);
 }