pretty blind try at merging in the latest trunk

1 files changed, 2 insertions, 6 deletions

diff --git a/irc.h b/irc.h
index a48836e7..8496e3e6 100644
--- a/irc.h
+++ b/irc.h
@@ -39,6 +39,7 @@
 #define CMODES "nt"
 #define CMODE "t"
 #define UMODE "s"
+#define CTYPES "&#"
 
 typedef enum
 {
@@ -49,11 +50,6 @@ typedef enum
 	USTATUS_SHUTDOWN = 8
 } irc_status_t;
 
-typedef struct channel
-{
-	char *name;
-} channel_t;
-
 typedef struct irc
 {
 	int fd;
@@ -88,6 +84,7 @@ typedef struct irc
 	
 	struct query *queries;
 	struct account *accounts;
+	struct chat *chatrooms;
 	
 	struct __USER *users;
 	GHashTable *userhash;
@@ -103,7 +100,6 @@ typedef struct irc
 } irc_t;
 
 #include "user.h"
-// #include "nick.h"
 
 extern GSList *irc_connection_list;