X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.h;h=44a1b5fed519b9e2b21ad8a9321cd693d15ee471;hb=5ee3db88fdd2cbe29b490a53e7e55f2a56e9cf65;hp=887baa0a4bd6d0efd70942eb02cfbfb037bbf0f7;hpb=ebdd6565cbbd2db46833530112c15be0e22afc29;p=umurmur.git

diff --git a/src/channel.h b/src/channel.h
index 887baa0..44a1b5f 100644
--- 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.
 
@@ -39,8 +39,10 @@ typedef struct channel {
 	int id;
 	char *name;
 	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;
@@ -55,6 +57,13 @@ typedef struct {
 	struct dlist node;
 } channellist_t;
 
+typedef struct {
+  bool_t CHJOIN_SILENT,
+	CHJOIN_NOENTER,
+	CHJOIN_WRONGPW,
+	CHJOIN_NOTFOUND;
+} channelJoinResult_t;
+	
 void Chan_init();
 void Chan_free();
 void Chan_addChannel(channel_t *parent, channel_t *sub);
@@ -64,7 +73,7 @@ void Chan_removeClient(channel_t *c, client_t *client);
 int Chan_userJoin(channel_t *ch, client_t *client);
 int Chan_userJoin_id(int channelid, client_t *client);
 int Chan_userLeave(client_t *client);
-bool_t Chan_userJoin_id_test(int channelid);
+channelJoinResult_t Chan_userJoin_id_test(int channelid, client_t *client);
 channel_t *Chan_iterate(channel_t **channelpptr);
 channel_t *Chan_iterate_siblings(channel_t *parent, channel_t **channelpptr);
 channel_t *Chan_createChannel(const char *name, const char *desc);