From 5c09a593072914336dcec3e8e92b28a1d4f03fa0 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 16 Nov 2005 00:16:39 +0100 Subject: Got rid of raw ^B's in source, Replaced most irc_usermsg() calls in nogaim.c with serv_got_crap(), Slightly clearer handling of buddy add requests. Thanks to timing for the patch. --- query.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'query.c') diff --git a/query.c b/query.c index 0eda3584..b21c39e1 100644 --- a/query.c +++ b/query.c @@ -126,16 +126,16 @@ 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 ); - irc_usermsg( irc, "Accepted: %s", q->question ); + serv_got_crap( q->gc, "\2Accepted\2: %s", q->question ); } else { q->no( NULL, q->data ); - irc_usermsg( irc, "Rejected: %s", q->question ); + serv_got_crap( q->gc, "\2Rejected\2: %s", q->question ); } q->data = NULL; @@ -148,11 +148,15 @@ void query_answer( irc_t *irc, query_t *q, int ans ) static void query_display( irc_t *irc, query_t *q ) { if( q->gc ) - irc_usermsg( irc, "Question on %s connection (handle %s):", proto_name[q->gc->protocol], q->gc->username ); + { + serv_got_crap( q->gc, "New request:" ); + serv_got_crap( q->gc, "%s\nYou can use the yes/no commands to accept/reject this request.", q->question ); + } else - irc_usermsg( irc, "Question:" ); - - irc_usermsg( irc, "%s\nYou can use the yes/no commands to answer this question.", q->question ); + { + irc_usermsg( irc, "New request:" ); + irc_usermsg( irc, "%s\nYou can use the yes/no commands to accept/reject this request.", q->question ); + } } static query_t *query_default( irc_t *irc ) -- cgit v1.2.3 From ea85a0b99185c53fac40c2150937d5e1a2ca546a Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 16 Nov 2005 15:22:22 +0100 Subject: Some more formatting changes in the auth. request messages --- query.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'query.c') diff --git a/query.c b/query.c index b21c39e1..670dde36 100644 --- a/query.c +++ b/query.c @@ -130,12 +130,12 @@ void query_answer( irc_t *irc, query_t *q, int ans ) if( ans ) { q->yes( NULL, q->data ); - serv_got_crap( q->gc, "\2Accepted\2: %s", q->question ); + serv_got_crap( q->gc, "Accepted: %s", q->question ); } else { q->no( NULL, q->data ); - serv_got_crap( q->gc, "\2Rejected\2: %s", q->question ); + serv_got_crap( q->gc, "Rejected: %s", q->question ); } q->data = NULL; @@ -149,13 +149,11 @@ static void query_display( irc_t *irc, query_t *q ) { if( q->gc ) { - serv_got_crap( q->gc, "New request:" ); - serv_got_crap( q->gc, "%s\nYou can use the yes/no commands to accept/reject this request.", q->question ); + serv_got_crap( q->gc, "New request: %s\nYou can use the \2yes\2/\2no\2 commands to accept/reject this request.", q->question ); } else { - irc_usermsg( irc, "New request:" ); - irc_usermsg( irc, "%s\nYou can use the yes/no commands to accept/reject this request.", q->question ); + irc_usermsg( irc, "New request: %s\nYou can use the \2yes\2/\2no\2 commands to accept/reject this request.", q->question ); } } -- cgit v1.2.3