From 691f8a6015bafcf6ed4f99a3649d428fb7a8e915 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <calcurse@cryptocrack.de>
Date: Thu, 12 Apr 2012 23:40:35 +0200
Subject: Refactor startup screen branch
Removes the pointless first parameter to io_startup_screen() and saves
one wins_update() call if system dialogs are disabled.
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
---
src/calcurse.c | 7 +++++--
src/calcurse.h | 2 +-
src/io.c | 22 ++++++++--------------
3 files changed, 14 insertions(+), 17 deletions(-)
(limited to 'src')
diff --git a/src/calcurse.c b/src/calcurse.c
index f681d12..37c3cac 100644
--- a/src/calcurse.c
+++ b/src/calcurse.c
@@ -161,8 +161,11 @@ main (int argc, char **argv)
wins_reinit ();
if (notify_bar ())
notify_start_main_thread ();
- wins_update (FLAG_ALL);
- io_startup_screen (conf.system_dialogs, no_data_file);
+ if (conf.system_dialogs)
+ {
+ wins_update (FLAG_ALL);
+ io_startup_screen (no_data_file);
+ }
inday = *day_process_storage (0, 0, &inday);
wins_slctd_set (CAL);
wins_update (FLAG_ALL);
diff --git a/src/calcurse.h b/src/calcurse.h
index b170032..b07ce45 100644
--- a/src/calcurse.h
+++ b/src/calcurse.h
@@ -703,7 +703,7 @@ void io_check_dir (char *, int *);
unsigned io_file_exist (char *);
void io_check_file (char *, int *);
int io_check_data_files (void);
-void io_startup_screen (unsigned, int);
+void io_startup_screen (int);
void io_export_data (enum export_type);
void io_export_bar (void);
void io_import_data (enum import_type, char *);
diff --git a/src/io.c b/src/io.c
index ded7889..2067dd0 100644
--- a/src/io.c
+++ b/src/io.c
@@ -988,23 +988,17 @@ io_check_data_files (void)
/* Draw the startup screen */
void
-io_startup_screen (unsigned show_dialogs, int no_data_file)
+io_startup_screen (int no_data_file)
{
- const char *welcome_mesg =
- _("Welcome to Calcurse. Missing data files were created.");
- const char *data_mesg = _("Data files found. Data will be loaded now.");
const char *enter = _("Press [ENTER] to continue");
- if (no_data_file != 0)
- {
- status_mesg (welcome_mesg, enter);
- wgetch (win[STA].p);
- }
- else if (show_dialogs)
- {
- status_mesg (data_mesg, enter);
- wgetch (win[STA].p);
- }
+ if (no_data_file)
+ status_mesg (_("Data files found. Data will be loaded now."), enter);
+ else
+ status_mesg (_("Welcome to Calcurse. Missing data files were created."),
+ enter);
+
+ wgetch (win[STA].p);
}
/* Export calcurse data. */
--
cgit v1.2.3-70-g09d2