remove the rest of the splash screen

See http://musicpd.org/mantis/view.php?id=2981

diff --git a/doc/ncmpc.1 b/doc/ncmpc.1
index 4d740526ea37b183cf72eb6e09714819f61dbd3b..fe977638f8469db2cb4601245dfa4e790b85e5f6 100644 (file)
--- a/doc/ncmpc.1
+++ b/doc/ncmpc.1
@@ -60,9 +60,6 @@ Read configuration from file.
 .B \-k, \-\-key\-file=FILE
 Read key bindings from FILE.
 .TP
-.B \-S, \-\-no\-splash
-Disable the splash screen.
-.TP 
 Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options.
 .SH "CONFIGURATION"
 When ncmpc start it tries to read user setting from the ~/.ncmpc/config. If no user configuration is found ncmpc tries to load global settings from $SYSCONFDIR/ncmpc/config (the actual path is displayed on the help screen). An example configuration file (config.sample) should be provided with ncmpc.

diff --git a/src/conf.c b/src/conf.c
index ea35486b9f2f4d5dab630e782ae0de7c7bd23cc6..a537663d161c7d72e7c7d822a4e34b7a9f885440 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -69,7 +69,6 @@
 #define CONF_PORT "port"
 #define CONF_PASSWORD "password"
 #define CONF_LYRICS_TIMEOUT "lyrics-timeout"
-#define CONF_SHOW_SPLASH "show-splash"
 #define CONF_SCROLL "scroll"
 #define CONF_SCROLL_SEP "scroll-sep"
 #define CONF_VISIBLE_BITRATE "visible-bitrate"
@@ -484,8 +483,6 @@ parse_line(char *line)
        else if (!strcasecmp(CONF_SCREEN_LIST, name)) {
                g_strfreev(options.screen_list);
                options.screen_list = check_screen_list(value);
-       } else if (!strcasecmp(CONF_SHOW_SPLASH, name)) {
-               /* the splash screen was removed */
        } else if (!strcasecmp(CONF_HOST, name))
                options.host = get_format(value);
        else if (!strcasecmp(CONF_PORT, name))

diff --git a/src/options.c b/src/options.c
index e863c726f7173ddb73870d9338ee2aff4d92e42a..53e68d0d3f0c0830e7133420937b110e688811cc 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -84,7 +84,6 @@ static const arg_opt_t option_table[] = {
        { 'P', "password","PASSWORD", "Connect with password" },
        { 'f', "config", "FILE", "Read configuration from file" },
        { 'k', "key-file","FILE", "Read configuration from file" },
-       { 'S', "no-splash", NULL, "Don't show the splash screen" },
 #ifndef NDEBUG
        { 'K', "dump-keys", NULL, "Dump key bindings to stdout" },
 #endif
@@ -266,9 +265,6 @@ handle_option(int c, const char *arg)
                g_free(options.key_file);
                options.key_file = g_strdup(arg);
                break;
-       case 'S': /* --key-file */
-               /* the splash screen was removed */
-               break;
 #ifndef NDEBUG
 #ifndef NCMPC_MINI
        case 'K': /* --dump-keys */