X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.h;h=d348184f8ccf9602268a49828270999779444af3;hb=HEAD;hp=c32ae5be41d18551ddc162e4f054cf226b2bcc37;hpb=77d660e915420444be90d37c6530797122d0c156;p=umurmur.git

diff --git a/src/channel.h b/src/channel.h
index c32ae5b..d348184 100644
--- a/src/channel.h
+++ b/src/channel.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2013, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2013, 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.
 
@@ -42,13 +42,13 @@ typedef struct channel {
 	char *password;
 	struct channel *parent;
 	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();