From ed3261a2385ad7a1e81e767d4cf27bc46ccbe305 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 2 Feb 2013 19:57:46 +0000 Subject: [PATCH] Added ui subdir to source --- Makefile.am | 20 ++++++++++---------- src/command.c | 2 +- src/profanity.c | 2 +- src/{ui_inputwin.c => ui/inputwin.c} | 2 +- src/{ui_statusbar.c => ui/statusbar.c} | 2 +- src/{ui_titlebar.c => ui/titlebar.c} | 2 +- src/{ => ui}/ui.h | 0 src/{ => ui}/window.c | 0 src/{ => ui}/window.h | 0 src/{ui_windows.c => ui/windows.c} | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) rename src/{ui_inputwin.c => ui/inputwin.c} (99%) rename src/{ui_statusbar.c => ui/statusbar.c} (99%) rename src/{ui_titlebar.c => ui/titlebar.c} (99%) rename src/{ => ui}/ui.h (100%) rename src/{ => ui}/window.c (100%) rename src/{ => ui}/window.h (100%) rename src/{ui_windows.c => ui/windows.c} (99%) diff --git a/Makefile.am b/Makefile.am index c301a5ad..d320e067 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,16 @@ bin_PROGRAMS = profanity profanity_SOURCES = src/command.c src/contact.c src/command_history.c \ - src/preferences.c src/autocomplete.c src/ui_statusbar.c \ - src/command.h src/contact.h src/log.c src/preferences.h \ - src/autocomplete.h src/ui_titlebar.c src/ui_windows.c src/common.c \ - src/contact_list.c src/ui_inputwin.c src/log.h src/profanity.c \ - src/history.c src/ui.h src/common.h src/ contact_list.h \ - src/main.c src/profanity.h src/history.h src/tinyurl.c src/tinyurl.h \ - src/chat_session.c src/chat_session.h src/muc.c src/muc.h \ - src/command_parser.c src/theme.c src/theme.h src/window.c src/window.h \ - src/files.c src/files.h src/accounts.c src/accounts.h src/jid.h src/jid.c \ + src/preferences.c src/autocomplete.c src/command.h src/contact.h \ + src/log.c src/preferences.h src/autocomplete.h src/common.c \ + src/contact_list.c src/log.h src/profanity.c src/history.c src/common.h \ + src/contact_list.h src/main.c src/profanity.h src/history.h src/tinyurl.c \ + src/tinyurl.h src/chat_session.c src/chat_session.h src/muc.c src/muc.h \ + src/command_parser.c src/theme.c src/theme.h src/files.c src/files.h \ + src/accounts.c src/accounts.h src/jid.h src/jid.c \ src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/connection.c \ - src/xmpp/iq.c src/xmpp/message.c src/xmpp/presence.c src/xmpp/stanza.c + src/xmpp/iq.c src/xmpp/message.c src/xmpp/presence.c src/xmpp/stanza.c \ + src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/windows.c \ + src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c TESTS = tests/testsuite check_PROGRAMS = tests/testsuite diff --git a/src/command.c b/src/command.c index 2737c22a..ccb506ed 100644 --- a/src/command.c +++ b/src/command.c @@ -41,7 +41,7 @@ #include "muc.h" #include "theme.h" #include "tinyurl.h" -#include "ui.h" +#include "ui/ui.h" #include "xmpp/xmpp.h" typedef char*(*autocomplete_func)(char *); diff --git a/src/profanity.c b/src/profanity.c index 2cb028f7..1875e4d4 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -41,7 +41,7 @@ #include "profanity.h" #include "muc.h" #include "theme.h" -#include "ui.h" +#include "ui/ui.h" #include "xmpp/xmpp.h" static log_level_t _get_log_level(char *log_level); diff --git a/src/ui_inputwin.c b/src/ui/inputwin.c similarity index 99% rename from src/ui_inputwin.c rename to src/ui/inputwin.c index 06a3427f..46a3cb13 100644 --- a/src/ui_inputwin.c +++ b/src/ui/inputwin.c @@ -1,5 +1,5 @@ /* - * ui_inputwin.c + * inputwin.c * * Copyright (C) 2012, 2013 James Booth * diff --git a/src/ui_statusbar.c b/src/ui/statusbar.c similarity index 99% rename from src/ui_statusbar.c rename to src/ui/statusbar.c index 9cc85108..07f4295a 100644 --- a/src/ui_statusbar.c +++ b/src/ui/statusbar.c @@ -1,5 +1,5 @@ /* - * ui_statusbar.c + * statusbar.c * * Copyright (C) 2012, 2013 James Booth * diff --git a/src/ui_titlebar.c b/src/ui/titlebar.c similarity index 99% rename from src/ui_titlebar.c rename to src/ui/titlebar.c index 17886a24..e563381b 100644 --- a/src/ui_titlebar.c +++ b/src/ui/titlebar.c @@ -1,5 +1,5 @@ /* - * ui_titlebar.c + * titlebar.c * * Copyright (C) 2012, 2013 James Booth * diff --git a/src/ui.h b/src/ui/ui.h similarity index 100% rename from src/ui.h rename to src/ui/ui.h diff --git a/src/window.c b/src/ui/window.c similarity index 100% rename from src/window.c rename to src/ui/window.c diff --git a/src/window.h b/src/ui/window.h similarity index 100% rename from src/window.h rename to src/ui/window.h diff --git a/src/ui_windows.c b/src/ui/windows.c similarity index 99% rename from src/ui_windows.c rename to src/ui/windows.c index d2e69ee1..b809a513 100644 --- a/src/ui_windows.c +++ b/src/ui/windows.c @@ -1,5 +1,5 @@ /* - * ui_windows.c + * windows.c * * Copyright (C) 2012, 2013 James Booth *