diff src/server.c @ 12677:f5c72fd691ee

[gaim-migrate @ 15020] Move the away %n %d %t substitution code out of server.c and into oscar.c committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 29 Dec 2005 19:36:59 +0000
parents 4c7e5eb7c09d
children eda1572c788b
line wrap: on
line diff
--- a/src/server.c	Thu Dec 29 19:34:23 2005 +0000
+++ b/src/server.c	Thu Dec 29 19:36:59 2005 +0000
@@ -499,8 +499,6 @@
 	if (!gaim_presence_is_available(presence))
 	{
 		time_t t = time(NULL);
-		GaimBuddy *b = gaim_find_buddy(gc->account, name);
-		const char *alias = b ? gaim_buddy_get_alias(b) : name;
 		struct last_auto_response *lar;
 		const gchar *auto_reply_pref;
 		const char *away_msg;
@@ -559,15 +557,11 @@
 		if ((away_msg == NULL) || (*away_msg == '\0'))
 			return;
 
-		/* Move this to oscar.c! */
-		buffy = gaim_str_sub_away_formatters(away_msg, alias);
-		serv_send_im(gc, name, buffy, GAIM_MESSAGE_AUTO_RESP);
+		serv_send_im(gc, name, away_msg, GAIM_MESSAGE_AUTO_RESP);
 
-		gaim_conv_im_write(GAIM_CONV_IM(cnv), NULL, buffy,
+		gaim_conv_im_write(GAIM_CONV_IM(cnv), NULL, away_msg,
 						   GAIM_MESSAGE_SEND | GAIM_MESSAGE_AUTO_RESP,
 						   mtime);
-
-		g_free(buffy);
 	}
 	else
 	{