# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1137879268 0
# Node ID b7fd4315ab7960ef1af5eff5b7dea53a72a16acd
# Parent  78f8ef7f0f6d5875425c7117f63de9268ac3faf1
[gaim-migrate @ 15333]
Never auto-reply when available

committer: Tailor Script <tailor@pidgin.im>

diff -r 78f8ef7f0f6d -r b7fd4315ab79 src/server.c
--- a/src/server.c	Sat Jan 21 09:45:22 2006 +0000
+++ b/src/server.c	Sat Jan 21 21:34:28 2006 +0000
@@ -520,7 +520,8 @@
 
 		auto_reply_pref = gaim_prefs_get_string("/core/away/auto_reply");
 
-		if (gaim_presence_is_available(presence) ||
+		status = gaim_presence_get_active_status(presence);
+		if (gaim_status_is_available(status) ||
 		    !strcmp(auto_reply_pref, "never") ||
 		    (!gaim_presence_is_idle(presence) &&
 		     !strcmp(auto_reply_pref, "awayidle")))
@@ -529,10 +530,8 @@
 			return;
 		}
 
-		status = gaim_presence_get_active_status(presence);
-		if (status != NULL)
-			away_msg = gaim_value_get_string(
-				gaim_status_get_attr_value(status, "message"));
+		away_msg = gaim_value_get_string(
+			gaim_status_get_attr_value(status, "message"));
 
 		if ((away_msg != NULL) && (*away_msg != '\0')) {
 			struct last_auto_response *lar;