Changeset be999a5 for query.c

Timestamp:

2010-08-23T23:12:24Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ad2d8bc

Parents:

237eadd (diff), eb6df6a (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:

First step in this merge. Mostly a bzr merge and then a cleanup of conflicts
and parts I want to/have to redo (because of ui-fix).

File:

• query.c (modified) (3 diffs)

query.c

@@ -106 +106 @@
         int count = 0;
         
+        if( !ic )
+                return;
+        
         q = irc->queries;
         def = query_default( irc );
@@ -148 +151 @@
                 else
                         irc_usermsg( irc, "Accepted: %s", q->question );
-                q->yes( q->data );
+                if( q->yes )
+                        q->yes( q->data );
         }
         else
@@ -156 +160 @@
                 else
                         irc_usermsg( irc, "Rejected: %s", q->question );
-                q->no( q->data );
+                if( q->no )
+                        q->no( q->data );
         }
         q->data = NULL;