From a7ab2fcf9d02b39436e71a7a207bd13fd515958c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jonathan=20Neusch=C3=A4fer?= Date: Tue, 22 Nov 2011 22:54:55 +0100 Subject: [PATCH] rename screen_message to screen_status Its two functions are screen_status_message and screen_status_printf so this just seems logical to me. --- Makefile.am | 4 ++-- src/list_window.c | 2 +- src/main.c | 2 +- src/player_command.c | 2 +- src/screen.c | 2 +- src/screen_artist.c | 2 +- src/screen_browser.c | 2 +- src/screen_client.c | 2 +- src/screen_file.c | 2 +- src/screen_find.c | 2 +- src/screen_keydef.c | 2 +- src/screen_lyrics.c | 2 +- src/screen_outputs.c | 2 +- src/screen_queue.c | 2 +- src/screen_search.c | 2 +- src/{screen_message.c => screen_status.c} | 2 +- src/{screen_message.h => screen_status.h} | 4 ++-- 17 files changed, 19 insertions(+), 19 deletions(-) rename src/{screen_message.c => screen_status.c} (97%) rename src/{screen_message.h => screen_status.h} (93%) diff --git a/Makefile.am b/Makefile.am index dce18a5..b4207cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ ncmpc_headers = \ src/progress_bar.h \ src/status_bar.h \ src/screen.h \ - src/screen_message.h \ + src/screen_status.h \ src/screen_interface.h \ src/screen_list.h \ src/screen_find.h \ @@ -90,7 +90,7 @@ src_ncmpc_SOURCES = \ src/progress_bar.c \ src/status_bar.c \ src/screen.c \ - src/screen_message.c \ + src/screen_status.c \ src/screen_list.c \ src/screen_find.c \ src/screen_utils.c \ diff --git a/src/list_window.c b/src/list_window.c index 66c6d21..1c143d3 100644 --- a/src/list_window.c +++ b/src/list_window.c @@ -25,7 +25,7 @@ #include "command.h" #include "colors.h" #include "paint.h" -#include "screen_message.h" +#include "screen_status.h" #include "i18n.h" #include diff --git a/src/main.c b/src/main.c index 389b8c6..60f5d21 100644 --- a/src/main.c +++ b/src/main.c @@ -27,7 +27,7 @@ #include "ncu.h" #include "screen.h" #include "screen_utils.h" -#include "screen_message.h" +#include "screen_status.h" #include "strfsong.h" #include "i18n.h" #include "player_command.h" diff --git a/src/player_command.c b/src/player_command.c index 2455c83..59c9725 100644 --- a/src/player_command.c +++ b/src/player_command.c @@ -22,7 +22,7 @@ #include "options.h" #include "i18n.h" #include "screen_client.h" -#include "screen_message.h" +#include "screen_status.h" int seek_id = -1; int seek_target_time; diff --git a/src/screen.c b/src/screen.c index fdc168a..b341a8a 100644 --- a/src/screen.c +++ b/src/screen.c @@ -21,7 +21,7 @@ #include "screen_interface.h" #include "screen_list.h" #include "screen_utils.h" -#include "screen_message.h" +#include "screen_status.h" #include "config.h" #include "i18n.h" #include "charset.h" diff --git a/src/screen_artist.c b/src/screen_artist.c index 3ae2145..2b6448e 100644 --- a/src/screen_artist.c +++ b/src/screen_artist.c @@ -19,7 +19,7 @@ #include "screen_artist.h" #include "screen_interface.h" -#include "screen_message.h" +#include "screen_status.h" #include "screen_find.h" #include "screen_browser.h" #include "screen.h" diff --git a/src/screen_browser.c b/src/screen_browser.c index 04673f4..41783b5 100644 --- a/src/screen_browser.c +++ b/src/screen_browser.c @@ -22,7 +22,7 @@ #include "screen_file.h" #include "screen_song.h" #include "screen_lyrics.h" -#include "screen_message.h" +#include "screen_status.h" #include "screen_find.h" #include "screen.h" #include "i18n.h" diff --git a/src/screen_client.c b/src/screen_client.c index f864f19..b8e936f 100644 --- a/src/screen_client.c +++ b/src/screen_client.c @@ -19,7 +19,7 @@ #include "screen_client.h" #include "screen_utils.h" -#include "screen_message.h" +#include "screen_status.h" #include "mpdclient.h" #include "i18n.h" #include "charset.h" diff --git a/src/screen_file.c b/src/screen_file.c index 73f5600..46ffdc2 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -20,7 +20,7 @@ #include "screen_file.h" #include "screen_browser.h" #include "screen_interface.h" -#include "screen_message.h" +#include "screen_status.h" #include "screen_queue.h" #include "screen.h" #include "config.h" diff --git a/src/screen_find.c b/src/screen_find.c index 4113c39..3fdf9f3 100644 --- a/src/screen_find.c +++ b/src/screen_find.c @@ -19,7 +19,7 @@ #include "screen_find.h" #include "screen_utils.h" -#include "screen_message.h" +#include "screen_status.h" #include "screen.h" #include "i18n.h" #include "options.h" diff --git a/src/screen_keydef.c b/src/screen_keydef.c index 8ecc003..cc3ccb5 100644 --- a/src/screen_keydef.c +++ b/src/screen_keydef.c @@ -19,7 +19,7 @@ #include "screen_keydef.h" #include "screen_interface.h" -#include "screen_message.h" +#include "screen_status.h" #include "screen_find.h" #include "i18n.h" #include "conf.h" diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c index e655fc5..5c04fe2 100644 --- a/src/screen_lyrics.c +++ b/src/screen_lyrics.c @@ -19,7 +19,7 @@ #include "screen_lyrics.h" #include "screen_interface.h" -#include "screen_message.h" +#include "screen_status.h" #include "screen_file.h" #include "screen_song.h" #include "i18n.h" diff --git a/src/screen_outputs.c b/src/screen_outputs.c index af0b2d3..98c4d9c 100644 --- a/src/screen_outputs.c +++ b/src/screen_outputs.c @@ -19,7 +19,7 @@ #include "screen_outputs.h" #include "screen_interface.h" -#include "screen_message.h" +#include "screen_status.h" #include "paint.h" #include "i18n.h" #include "list_window.h" diff --git a/src/screen_queue.c b/src/screen_queue.c index 31c4dcc..b21dc3a 100644 --- a/src/screen_queue.c +++ b/src/screen_queue.c @@ -20,7 +20,7 @@ #include "screen_queue.h" #include "screen_interface.h" #include "screen_file.h" -#include "screen_message.h" +#include "screen_status.h" #include "screen_find.h" #include "config.h" #include "i18n.h" diff --git a/src/screen_search.c b/src/screen_search.c index 86c2bb1..cff0b9d 100644 --- a/src/screen_search.c +++ b/src/screen_search.c @@ -19,7 +19,7 @@ #include "screen_search.h" #include "screen_interface.h" -#include "screen_message.h" +#include "screen_status.h" #include "screen.h" #include "i18n.h" #include "options.h" diff --git a/src/screen_message.c b/src/screen_status.c similarity index 97% rename from src/screen_message.c rename to src/screen_status.c index 6bb907d..36f8753 100644 --- a/src/screen_message.c +++ b/src/screen_status.c @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "screen_message.h" +#include "screen_status.h" #include "screen.h" #include diff --git a/src/screen_message.h b/src/screen_status.h similarity index 93% rename from src/screen_message.h rename to src/screen_status.h index fa789a6..d951290 100644 --- a/src/screen_message.h +++ b/src/screen_status.h @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef NCMPC_SCREEN_MESSAGE_H -#define NCMPC_SCREEN_MESSAGE_H +#ifndef NCMPC_SCREEN_STATUS_H +#define NCMPC_SCREEN_STATUS_H void screen_status_message(const char *msg); -- 2.30.2