Changeset c4a1036 for query.c

Timestamp:

2008-06-09T01:52:28Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

12ebe74

Parents:

e46e077 (diff), 783e9b7 (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 integration branch.

File:

• query.c (modified) (3 diffs)

query.c

@@ -30 +30 @@
 static query_t *query_default( irc_t *irc );
 
-query_t *query_add( irc_t *irc, struct im_connection *ic, char *question, void *yes, void *no, void *data )
+query_t *query_add( irc_t *irc, struct im_connection *ic, char *question,
+                    query_callback yes, query_callback no, void *data )
 {
         query_t *q = g_new0( query_t, 1 );
@@ -144 +145 @@
                 else
                         irc_usermsg( irc, "Accepted: %s", q->question );
-                q->yes( NULL, q->data );
+                q->yes( q->data );
         }
         else
@@ -152 +153 @@
                 else
                         irc_usermsg( irc, "Rejected: %s", q->question );
-                q->no( NULL, q->data );
+                q->no( q->data );
         }
         q->data = NULL;