Merge ui-fix (which includes killerbee (i.e. file transfers and libpurple

support)). ui-fix rewrites the complete IRC core, fixing many things that
were broken/hacky/limited so far.

The list is too long to include here, but http://wiki.bitlbee.org/UiFix
has a summary, as does doc/CHANGES and of course the full revision history.

1 files changed, 3 insertions, 2 deletions

diff --git a/query.h b/query.h
index e0ca32ec..f0419573 100644
--- a/query.h
+++ b/query.h
@@ -32,13 +32,14 @@ typedef struct query
 {
 	struct im_connection *ic;
 	char *question;
-	query_callback yes, no;
+	query_callback yes, no, free;
 	void *data;
 	struct query *next;
 } query_t;
 
 query_t *query_add( irc_t *irc, struct im_connection *ic, char *question,
-                    query_callback yes, query_callback no, void *data );
+                    query_callback yes, query_callback no, query_callback free,
+                    void *data );
 void query_del( irc_t *irc, query_t *q );
 void query_del_by_conn( irc_t *irc, struct im_connection *ic );
 void query_answer( irc_t *irc, query_t *q, int ans );