From 9d34c41227cb7567b26872f2a10a8f7a1b01f487 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 2 Feb 2013 21:59:29 +0000 Subject: [PATCH] Added config dir to source --- Makefile.am | 16 +++++++++------- src/chat_session.c | 2 +- src/command/command.c | 6 +++--- src/{ => config}/accounts.c | 0 src/{ => config}/accounts.h | 0 src/{ => config}/preferences.c | 0 src/{ => config}/preferences.h | 0 src/{ => config}/theme.c | 0 src/{ => config}/theme.h | 0 src/log.c | 2 +- src/profanity.c | 6 +++--- src/ui/inputwin.c | 4 ++-- src/ui/statusbar.c | 2 +- src/ui/titlebar.c | 2 +- src/ui/window.c | 2 +- src/ui/windows.c | 4 ++-- src/xmpp/connection.c | 2 +- src/xmpp/message.c | 2 +- src/xmpp/presence.c | 2 +- src/xmpp/xmpp.h | 2 +- 20 files changed, 28 insertions(+), 26 deletions(-) rename src/{ => config}/accounts.c (100%) rename src/{ => config}/accounts.h (100%) rename src/{ => config}/preferences.c (100%) rename src/{ => config}/preferences.h (100%) rename src/{ => config}/theme.c (100%) rename src/{ => config}/theme.h (100%) diff --git a/Makefile.am b/Makefile.am index dcdb459b..4953c182 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,9 @@ bin_PROGRAMS = profanity -profanity_SOURCES = src/contact.c src/preferences.c src/contact.h src/log.c \ - src/preferences.h src/common.c src/contact_list.c src/log.h \ - src/profanity.c src/common.h src/contact_list.h src/main.c \ - src/profanity.h src/chat_session.c src/chat_session.h src/muc.c src/muc.h \ - src/theme.c src/theme.h src/files.c src/files.h src/accounts.c \ - src/accounts.h src/jid.h src/jid.c \ +profanity_SOURCES = src/contact.c src/contact.h src/log.c src/common.c \ + src/contact_list.c src/log.h src/profanity.c src/common.h \ + src/contact_list.h src/main.c src/profanity.h src/chat_session.c \ + src/chat_session.h src/muc.c src/muc.h src/files.c src/files.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/stanza.h src/xmpp/message.h src/xmpp/iq.h src/xmpp/presence.h \ @@ -16,7 +15,10 @@ profanity_SOURCES = src/contact.c src/preferences.c src/contact.h src/log.c \ src/command/parser.h \ src/tools/autocomplete.c src/tools/autocomplete.h \ src/tools/history.c src/tools/history.h \ - src/tools/tinyurl.c src/tools/tinyurl.h + src/tools/tinyurl.c src/tools/tinyurl.h \ + src/config/accounts.c src/config/accounts.h \ + src/config/preferences.c src/config/preferences.h \ + src/config/theme.c src/config/theme.h TESTS = tests/testsuite check_PROGRAMS = tests/testsuite diff --git a/src/chat_session.c b/src/chat_session.c index d97a5184..281f4b96 100644 --- a/src/chat_session.c +++ b/src/chat_session.c @@ -27,8 +27,8 @@ #include "chat_session.h" +#include "config/preferences.h" #include "log.h" -#include "preferences.h" #define PAUSED_TIMOUT 10.0 #define INACTIVE_TIMOUT 30.0 diff --git a/src/command/command.c b/src/command/command.c index 778339fa..05123015 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -27,20 +27,20 @@ #include -#include "accounts.h" #include "chat_session.h" #include "command/command.h" #include "command/history.h" #include "command/parser.h" #include "common.h" +#include "config/accounts.h" +#include "config/preferences.h" +#include "config/theme.h" #include "contact.h" #include "contact_list.h" #include "jid.h" #include "log.h" #include "muc.h" -#include "preferences.h" #include "profanity.h" -#include "theme.h" #include "tools/autocomplete.h" #include "tools/tinyurl.h" #include "ui/ui.h" diff --git a/src/accounts.c b/src/config/accounts.c similarity index 100% rename from src/accounts.c rename to src/config/accounts.c diff --git a/src/accounts.h b/src/config/accounts.h similarity index 100% rename from src/accounts.h rename to src/config/accounts.h diff --git a/src/preferences.c b/src/config/preferences.c similarity index 100% rename from src/preferences.c rename to src/config/preferences.c diff --git a/src/preferences.h b/src/config/preferences.h similarity index 100% rename from src/preferences.h rename to src/config/preferences.h diff --git a/src/theme.c b/src/config/theme.c similarity index 100% rename from src/theme.c rename to src/config/theme.c diff --git a/src/theme.h b/src/config/theme.h similarity index 100% rename from src/theme.h rename to src/config/theme.h diff --git a/src/log.c b/src/log.c index fd7bd370..0282f60f 100644 --- a/src/log.c +++ b/src/log.c @@ -32,8 +32,8 @@ #include "log.h" #include "common.h" +#include "config/preferences.h" #include "files.h" -#include "preferences.h" #define PROF "prof" diff --git a/src/profanity.c b/src/profanity.c index a5514b57..f0a9372e 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -31,8 +31,10 @@ #include "profanity.h" -#include "accounts.h" #include "chat_session.h" +#include "config/accounts.h" +#include "config/preferences.h" +#include "config/theme.h" #include "command/command.h" #include "common.h" #include "contact.h" @@ -40,8 +42,6 @@ #include "files.h" #include "log.h" #include "muc.h" -#include "preferences.h" -#include "theme.h" #include "ui/ui.h" #include "xmpp/xmpp.h" diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 5ddafa97..427d229c 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -35,11 +35,11 @@ #include "command/command.h" #include "common.h" +#include "config/preferences.h" +#include "config/theme.h" #include "contact_list.h" #include "log.h" -#include "preferences.h" #include "profanity.h" -#include "theme.h" #include "ui/ui.h" #define _inp_win_refresh() prefresh(inp_win, 0, pad_start, rows-1, 0, rows-1, cols-1) diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c index 7d894f07..a2b09470 100644 --- a/src/ui/statusbar.c +++ b/src/ui/statusbar.c @@ -31,7 +31,7 @@ #include #endif -#include "theme.h" +#include "config/theme.h" #include "ui/ui.h" static WINDOW *status_bar; diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c index fc208063..2276986a 100644 --- a/src/ui/titlebar.c +++ b/src/ui/titlebar.c @@ -24,7 +24,7 @@ #include #include "common.h" -#include "theme.h" +#include "config/theme.h" #include "ui/ui.h" static WINDOW *title_bar; diff --git a/src/ui/window.c b/src/ui/window.c index b9c5d9cb..85648814 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -32,7 +32,7 @@ #include #endif -#include "theme.h" +#include "config/theme.h" #include "ui/window.h" #define CONS_WIN_TITLE "_cons" diff --git a/src/ui/windows.c b/src/ui/windows.c index 1fa1c01d..a868aa5f 100644 --- a/src/ui/windows.c +++ b/src/ui/windows.c @@ -43,13 +43,13 @@ #include "chat_session.h" #include "command/command.h" #include "common.h" +#include "config/preferences.h" +#include "config/theme.h" #include "contact.h" #include "contact_list.h" #include "jid.h" #include "log.h" #include "muc.h" -#include "preferences.h" -#include "theme.h" #include "ui/ui.h" #include "ui/window.h" diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index 93512f5e..57528bb6 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -28,11 +28,11 @@ #include "chat_session.h" #include "common.h" +#include "config/preferences.h" #include "contact_list.h" #include "jid.h" #include "log.h" #include "muc.h" -#include "preferences.h" #include "profanity.h" #include "xmpp/iq.h" #include "xmpp/message.h" diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 42769cf7..b20d773b 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -26,9 +26,9 @@ #include #include "chat_session.h" +#include "config/preferences.h" #include "log.h" #include "muc.h" -#include "preferences.h" #include "profanity.h" #include "xmpp/message.h" #include "xmpp/stanza.h" diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index f4631b12..7fd58df6 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -26,9 +26,9 @@ #include #include "common.h" +#include "config/preferences.h" #include "log.h" #include "muc.h" -#include "preferences.h" #include "profanity.h" #include "xmpp/capabilities.h" #include "xmpp/stanza.h" diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index ab22d191..d81be248 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -25,7 +25,7 @@ #include -#include "accounts.h" +#include "config/accounts.h" #include "jid.h" #define JABBER_PRIORITY_MIN -128