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, 0 deletions

diff --git a/conf.h b/conf.h
index b112681d..f4976039 100644
--- a/conf.h
+++ b/conf.h
@@ -49,6 +49,9 @@ typedef struct conf
 	int ping_interval;
 	int ping_timeout;
 	char *user;
+	size_t ft_max_size;
+	int ft_max_kbps;
+	char *ft_listen;
 	char **protocols;
 } conf_t;