Changeset 601e813 for query.c

Timestamp:

2006-05-24T23:04:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

80c1e4d

Parents:

46ad029 (diff), fc630f9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

[merge] Wilmer

File:

• query.c (modified) (2 diffs)

query.c

@@ -39 +39 @@
         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 )
@@ -127 +138 @@
                 disp = 1;
         }
-        //Using irc_usermsg instead of serv_got_crap because \x02A is a char too, so a SPACE is needed. 
         if( ans )
         {
+                serv_got_crap( q->gc, "Accepted: %s", q->question );
                 q->yes( NULL, q->data );
-                serv_got_crap( q->gc, "Accepted: %s", q->question );
         }
         else
         {
+                serv_got_crap( q->gc, "Rejected: %s", q->question );
                 q->no( NULL, q->data );
-                serv_got_crap( q->gc, "Rejected: %s", q->question );
         }
         q->data = NULL;