X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui.c;h=e854294ece0a4db3667480c80ed06160dd980f13;hb=0569a928e03cb1489d04e1b89be32b24d59de0e3;hp=7507eea4cbe0364f837d94761ae36aa626dddd04;hpb=61a22ff7302998a8ed75a168a2c8147b39508b95;p=paraslash.git

diff --git a/gui.c b/gui.c
index 7507eea4..e854294e 100644
--- a/gui.c
+++ b/gui.c
@@ -53,7 +53,7 @@ static struct ringbuffer *bot_win_rb;
 
 static unsigned scroll_position;
 
-static int curses_active;
+static bool curses_active;
 static pid_t cmd_pid;
 
 static int command_fds[2] = {-1, -1};
@@ -564,7 +564,7 @@ static void shutdown_curses(void)
 	if (!curses_active)
 		return;
 	def_prog_mode();
-	curses_active = 0;
+	curses_active = false;
 	endwin();
 }
 
@@ -823,7 +823,7 @@ static void init_colors_or_die(void)
 /* (Re-)initialize the curses library. */
 static void init_curses(void)
 {
-	curses_active = 1;
+	curses_active = true;
 	if (top.win && refresh() == ERR) /* refresh is really needed */
 		msg_n_exit(EXIT_FAILURE, "refresh() failed\n");
 	if (LINES < theme.lines_min || COLS < theme.cols_min)
@@ -887,25 +887,25 @@ static int check_key_map_args(void)
 	for (i = 0; i < conf.key_map_given; ++i) {
 		s = conf.key_map_arg[i];
 		if (!(*s))
-			goto err_out;
+			goto out;
 		free(tmp);
 		tmp = para_strdup(s);
 		if (!split_key_map(tmp, &handler, &arg))
-			goto err_out;
+			goto out;
 		if (strlen(handler) != 1)
-			goto err_out;
+			goto out;
 		if (*handler != 'x'
 			&& *handler != 'd'
 			&& *handler != 'i'
 			&& *handler != 'p')
-			goto err_out;
+			goto out;
 		if (*handler != 'i')
 			continue;
 		if (find_cmd_byname(arg) < 0)
-			goto err_out;
+			goto out;
 	}
 	ret = 0;
-err_out:
+out:
 	free(tmp);
 	return ret;
 }
@@ -1553,7 +1553,6 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 	init_theme_or_die(conf.theme_arg, &theme);
-	top.lines = theme.top_lines_default;
 	setup_signal_handling();
 	bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
 	setlocale(LC_CTYPE, "");