Merging mainline.

1 files changed, 3 insertions, 8 deletions

diff --git a/irc_commands.c b/irc_commands.c
index 74334ee9..a417e0d9 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -447,7 +447,6 @@ static void irc_cmd_away( irc_t *irc, char **cmd )
 {
 	user_t *u = user_find( irc, irc->nick );
 	char *away = cmd[1];
-	account_t *a;
 	
 	if( !u ) return;
 	
@@ -474,13 +473,7 @@ static void irc_cmd_away( irc_t *irc, char **cmd )
 		irc_reply( irc, 305, ":Welcome back" );
 	}
 	
-	for( a = irc->accounts; a; a = a->next )
-	{
-		struct im_connection *ic = a->ic;
-		
-		if( ic && ic->flags & OPT_LOGGED_IN )
-			imc_set_away( ic, u->away );
-	}
+	set_setstr( &irc->set, "away", u->away );
 }
 
 static void irc_cmd_whois( irc_t *irc, char **cmd )
@@ -503,6 +496,8 @@ static void irc_cmd_whois( irc_t *irc, char **cmd )
 			irc_reply( irc, 301, "%s :%s", u->nick, "User is offline" );
 		else if( u->away )
 			irc_reply( irc, 301, "%s :%s", u->nick, u->away );
+		if( u->status_msg )
+			irc_reply( irc, 333, "%s :Status: %s", u->nick, u->status_msg );
 		
 		irc_reply( irc, 318, "%s :End of /WHOIS list", nick );
 	}