Use Client_find_by_session() instead of a few open-coded loops.

[umurmur.git] / src / channel.h

diff --git a/src/channel.h b/src/channel.h
index 7c4a2995fe7d8226d7add8cec6cf3362ecfb6f5e..d348184f8ccf9602268a49828270999779444af3 100644 (file)
--- a/src/channel.h
+++ b/src/channel.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -41,14 +41,14 @@ typedef struct channel {
        char *desc;
        char *password;
        struct channel *parent;
-       bool_t temporary, noenter;
+       bool_t temporary, noenter, silent;
+       int position;
        struct dlist node;
        struct dlist subs;
        struct dlist clients;
        struct dlist flatlist_node;
        struct dlist channel_links;
        int linkcount;
-       struct dlist link_node;
 } channel_t;
 
 typedef struct {
@@ -56,11 +56,11 @@ typedef struct {
        struct dlist node;
 } channellist_t;
 
-typedef enum {
-       CHJOIN_OK,
+typedef struct {
+  bool_t CHJOIN_SILENT,
        CHJOIN_NOENTER,
        CHJOIN_WRONGPW,
-       CHJOIN_NOTFOUND,
+       CHJOIN_NOTFOUND;
 } channelJoinResult_t;
        
 void Chan_init();