Changeset 673a54c for irc.h

Timestamp:

2009-03-12T19:33:28Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

fc34fb5

Parents:

823de9d (diff), 9e768da (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:

pretty blind try at merging in the latest trunk

File:

• irc.h (modified) (4 diffs)

irc.h

@@ -40 +40 @@
 #define CMODE "t"
 #define UMODE "s"
+#define CTYPES "&#"
 
 typedef enum
@@ -49 +50 @@
         USTATUS_SHUTDOWN = 8
 } irc_status_t;
-
-typedef struct channel
-{
-        char *name;
-} channel_t;
 
 typedef struct irc
@@ -89 +85 @@
         struct query *queries;
         struct account *accounts;
+        struct chat *chatrooms;
         
         struct __USER *users;
@@ -104 +101 @@
 
 #include "user.h"
-// #include "nick.h"
 
 extern GSList *irc_connection_list;