[merge] Wilmer

1 files changed, 13 insertions, 3 deletions

diff --git a/query.c b/query.c
index 670dde36..39821f3a 100644
--- a/query.c
+++ b/query.c
@@ -39,6 +39,17 @@ query_t *query_add( irc_t *irc, struct gaim_connection *gc, char *question, void
 	q->no = no;
 	q->data = data;
 	
+	if( strchr( irc->umode, 'b' ) != NULL )
+	{
+		char *s;
+		
+		/* At least for the machine-parseable version, get rid of
+		   newlines to make "parsing" easier. */
+		for( s = q->question; *s; s ++ )
+			if( *s == '\r' || *s == '\n' )
+				*s = ' ';
+	}
+	
 	if( irc->queries )
 	{
 		query_t *l = irc->queries;
@@ -126,16 +137,15 @@ void query_answer( irc_t *irc, query_t *q, int ans )
 		q = query_default( irc );
 		disp = 1;
 	}
-	//Using irc_usermsg instead of serv_got_crap because \x02A is a char too, so a SPACE is needed.	
 	if( ans )
 	{
-		q->yes( NULL, q->data );
 		serv_got_crap( q->gc, "Accepted: %s", q->question );
+		q->yes( NULL, q->data );
 	}
 	else
 	{
-		q->no( NULL, q->data );
 		serv_got_crap( q->gc, "Rejected: %s", q->question );
+		q->no( NULL, q->data );
 	}
 	q->data = NULL;