From: Andre Noll <maan@systemlinux.org>
Date: Mon, 19 Jan 2009 13:49:09 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.3.4~73^2~5
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691

Merge commit 'meins/master'
---

00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691
diff --cc gui.c
index 36d47994,499845d9..0a8f0818
--- a/gui.c
+++ b/gui.c
@@@ -1179,13 -1180,13 +1180,13 @@@ static void com_ll_decr(void
  
  static void com_ll_incr(void)
  {
- 	if (conf.loglevel_arg >= EMERG) {
+ 	if (loglevel >= LL_EMERG) {
  		print_in_bar(COLOR_ERRMSG,
 -			"loglevel already at miminal verbosity\n");
 +			"loglevel already at minimal verbosity\n");
  		return;
  	}
- 	conf.loglevel_arg++;
- 	print_in_bar(COLOR_MSG, "loglevel set to %d\n", conf.loglevel_arg);
+ 	loglevel++;
+ 	print_in_bar(COLOR_MSG, "loglevel set to %d\n", loglevel);
  }
  
  /*