Changeset c5bc47b for irc.h

Timestamp:

2009-10-17T17:24:52Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c48a033

Parents:

0c41177 (diff), 2e44b1f (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 BitlBee 1.2.4.

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
@@ -87 +83 @@
         struct query *queries;
         struct account *accounts;
+        struct chat *chatrooms;
         
         struct __USER *users;
@@ -100 +97 @@
 
 #include "user.h"
-// #include "nick.h"
 
 extern GSList *irc_connection_list;