Changeset 2288705 for irc.h

Timestamp:

2009-12-07T21:54:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1c3008a

Parents:

aac4017 (diff), 36cf9fd (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:

Merging head.

File:

• irc.h (modified) (4 diffs)

irc.h

@@ -38 +38 @@
 #define CMODE "t"
 #define UMODE "s"
+#define CTYPES "&#"
 
 typedef enum
@@ -47 +48 @@
         USTATUS_SHUTDOWN = 8
 } irc_status_t;
-
-typedef struct channel
-{
-        char *name;
-} channel_t;
 
 typedef struct irc
@@ -88 +84 @@
         struct account *accounts;
         GSList *file_transfers;
+        struct chat *chatrooms;
         
         struct __USER *users;
@@ -101 +98 @@
 
 #include "user.h"
-// #include "nick.h"
 
 extern GSList *irc_connection_list;