diff options
Diffstat (limited to '')
| -rw-r--r-- | src/screen_clock.c | 4 | ||||
| -rw-r--r-- | src/screen_file.c | 11 | ||||
| -rw-r--r-- | src/screen_help.c | 8 | ||||
| -rw-r--r-- | src/screen_keydef.c | 14 | ||||
| -rw-r--r-- | src/screen_play.c | 9 |
5 files changed, 26 insertions, 20 deletions
diff --git a/src/screen_clock.c b/src/screen_clock.c index 459d9e4b9..3fe2ec1c9 100644 --- a/src/screen_clock.c +++ b/src/screen_clock.c @@ -148,9 +148,9 @@ clock_close(void) } static char * -clock_title(void) +clock_title(char *str, size_t size) { - return _("Music Player Client - Clock"); + return _("Clock"); } static void diff --git a/src/screen_file.c b/src/screen_file.c index f86e8df95..8b7577fdf 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -1,5 +1,7 @@ /* - * (c) 2004 by Kalle Wallin (kaw@linux.se) + * $Id$ + * + * (c) 2004 by Kalle Wallin <kaw@linux.se> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -360,16 +362,15 @@ file_close(void) } static char * -file_title(void) +file_title(char *str, size_t size) { - static char buf[TITLESIZE]; char *tmp; tmp = utf8_to_locale(basename(mpc->cwd)); - snprintf(buf, TITLESIZE, _("Browse: %s"), tmp); + snprintf(str, size, _("Browse: %s"), tmp); g_free(tmp); - return buf; + return str; } static void diff --git a/src/screen_help.c b/src/screen_help.c index 0299d6ca4..8584bb7c9 100644 --- a/src/screen_help.c +++ b/src/screen_help.c @@ -1,5 +1,7 @@ /* - * (c) 2004 by Kalle Wallin (kaw@linux.se) + * $Id$ + * + * (c) 2004 by Kalle Wallin <kaw@linux.se> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -204,9 +206,9 @@ help_exit(void) static char * -help_title(void) +help_title(char *str, size_t size) { - return _("Music Player Client - Help"); + return _("Help"); } static void diff --git a/src/screen_keydef.c b/src/screen_keydef.c index 16311af56..2dda43db9 100644 --- a/src/screen_keydef.c +++ b/src/screen_keydef.c @@ -1,5 +1,7 @@ /* - * (c) 2004 by Kalle Wallin (kaw@linux.se) + * $Id$ + * + * (c) 2004 by Kalle Wallin <kaw@linux.se> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -271,17 +273,13 @@ keydef_close(void) } static char * -keydef_title(void) +keydef_title(char *str, size_t size) { - static char buf[BUFSIZE]; - if( subcmd<0 ) return _("Edit key bindings"); - snprintf(buf, BUFSIZE, - _("Edit keys for %s"), - cmds[subcmd].name); - return buf; + snprintf(str, size, _("Edit keys for %s"), cmds[subcmd].name); + return str; } static void diff --git a/src/screen_play.c b/src/screen_play.c index 8d3fc6cf7..9dc2a9651 100644 --- a/src/screen_play.c +++ b/src/screen_play.c @@ -151,9 +151,14 @@ play_exit(void) } static char * -play_title(void) +play_title(char *str, size_t size) { - return _("Music Player Client - Playlist"); + if( strcmp(options.host, "localhost") == 0 ) + return _("Playlist"); + + snprintf(str, size, _("Playlist on %s"), options.host); + + return str; } static void |