From e5eed3759b76d1319a6f0a8ea02c3fdf86a13523 Mon Sep 17 00:00:00 2001
From: Frederic Culot <calcurse@culot.org>
Date: Wed, 15 Aug 2007 15:37:53 +0000
Subject: layout_config() updated to use wins_set_layout()

---
 src/custom.c | 17 +++++++----------
 src/custom.h |  4 ++--
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/custom.c b/src/custom.c
index b6cb812..7d5fb76 100755
--- a/src/custom.c
+++ b/src/custom.c
@@ -1,4 +1,4 @@
-/*	$calcurse: custom.c,v 1.15 2007/07/28 13:11:42 culot Exp $	*/
+/*	$calcurse: custom.c,v 1.16 2007/08/15 15:37:53 culot Exp $	*/
 
 /*
  * Calcurse - text-based organizer
@@ -262,7 +262,7 @@ custom_load_conf(conf_t *conf, int background)
                         var = 0;
 			break;
 		case CUSTOM_CONF_LAYOUT:
-			conf->layout = atoi(e_conf);
+			wins_set_layout(atoi(e_conf));
 			var = 0;
 			break;
 		case CUSTOM_CONF_NOTIFYBARSHOW:
@@ -352,10 +352,10 @@ config_bar(void)
 }
 
 /* Choose the layout */
-int 
-layout_config(int layout)
+void 
+layout_config(void)
 {
-	int ch, old_layout;
+	int ch;
 	char *layout_mesg = _("Pick the desired layout on next screen [press ENTER]");
 	char *choice_mesg = _("('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)");
 	char *layout_up_mesg   = 
@@ -363,7 +363,6 @@ layout_config(int layout)
 	char *layout_down_mesg = 
 	_(" [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT");
 
-	old_layout = layout;
 	status_mesg(layout_mesg, choice_mesg);
 	wgetch(swin);
 	status_mesg(layout_up_mesg, layout_down_mesg);
@@ -371,12 +370,10 @@ layout_config(int layout)
 	doupdate();
 	while ((ch = wgetch(swin)) != 'q') {
 		if ( ch <= '8' && ch >= '1' ) {
-			layout = ch - '0';
-			return layout;
+			wins_set_layout(ch - '0');
+			return;
 		}
 	}
-	layout = old_layout;
-	return layout;
 }
 
 /* Color theme configuration. */
diff --git a/src/custom.h b/src/custom.h
index 30e63d8..9d98bc1 100755
--- a/src/custom.h
+++ b/src/custom.h
@@ -1,4 +1,4 @@
-/*	$calcurse: custom.h,v 1.8 2007/07/28 13:11:42 culot Exp $	*/
+/*	$calcurse: custom.h,v 1.9 2007/08/15 15:37:53 culot Exp $	*/
 
 /*
  * Calcurse - text-based organizer
@@ -71,7 +71,7 @@ void 	custom_apply_attr(WINDOW *, int);
 void 	custom_remove_attr(WINDOW *, int);
 void 	custom_load_conf(conf_t *, int);
 void 	config_bar(void);
-int 	layout_config(int);
+void 	layout_config(void);
 void 	custom_color_config(int);
 void 	custom_color_theme_name(char *);
 void 	custom_general_config(conf_t *);
-- 
cgit v1.2.3-54-g00ecf