X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.c;h=a9d2c08e88d030429e637d5ae82c408260da2439;hb=01e804f06e00c36c5680ebde07cbe17e6b256dc4;hp=3068cd7f1785e2e46759130fe524a35bcbab8b03;hpb=a2278f090858fcb69da788831f7e15775caab756;p=umurmur.git

diff --git a/src/conf.c b/src/conf.c
index 3068cd7..a9d2c08 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
    Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
@@ -195,20 +195,28 @@ int Conf_getNextChannel(conf_channel_t *chdesc, int index)
 	sprintf(configstr, "channels.[%d].name", index);
 	setting = config_lookup(&configuration, configstr);
 	if (setting == NULL)
-		return -1;
+		return -1; /* Required */
 	strncpy(chdesc->name, config_setting_get_string(setting), MAX_TEXT);
 	
 	sprintf(configstr, "channels.[%d].parent", index);
 	setting = config_lookup(&configuration, configstr);
 	if (setting == NULL)
-		return -1;
+		return -1; /* Required */
 	strncpy(chdesc->parent, config_setting_get_string(setting), MAX_TEXT);
 	
 	sprintf(configstr, "channels.[%d].description", index);
 	setting = config_lookup(&configuration, configstr);
-	if (setting == NULL)
-		return -1;
-	strncpy(chdesc->description, config_setting_get_string(setting), MAX_TEXT);
+	if (setting == NULL) /* Optional */
+		strncpy(chdesc->description, "", MAX_TEXT);
+	else
+		strncpy(chdesc->description, config_setting_get_string(setting), MAX_TEXT);
+	
+	sprintf(configstr, "channels.[%d].noenter", index);
+	setting = config_lookup(&configuration, configstr);
+	if (setting == NULL) /* Optional */
+		chdesc->noenter = false;
+	else
+		chdesc->noenter = config_setting_get_bool(setting);
 
 	return 0;
 }