From 2af0d38e3d9b766ec1fd1bd85edd899d01047a2b Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 24 Jul 2016 15:02:43 +0100 Subject: [PATCH] Moved muc.c --- Makefile.am | 4 ++-- src/command/cmd_ac.c | 2 +- src/command/cmd_defs.c | 2 +- src/command/cmd_funcs.c | 2 +- src/event/server_events.c | 2 +- src/profanity.c | 2 +- src/ui/console.c | 2 +- src/ui/core.c | 2 +- src/ui/inputwin.c | 2 +- src/ui/notifier.c | 2 +- src/ui/ui.h | 2 +- src/ui/window.h | 2 +- src/{ => xmpp}/muc.c | 0 src/{ => xmpp}/muc.h | 4 ++-- tests/unittests/test_cmd_bookmark.c | 2 +- tests/unittests/test_cmd_join.c | 2 +- tests/unittests/test_muc.c | 2 +- tests/unittests/test_server_events.c | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) rename src/{ => xmpp}/muc.c (100%) rename src/{ => xmpp}/muc.h (99%) diff --git a/Makefile.am b/Makefile.am index cbfe82c5..36af73cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ core_sources = \ src/xmpp/contact.c src/xmpp/contact.h src/log.c src/common.c \ src/log.h src/profanity.c src/common.h \ src/profanity.h src/xmpp/chat_session.c \ - src/xmpp/chat_session.h src/muc.c src/muc.h src/xmpp/jid.h src/xmpp/jid.c \ + src/xmpp/chat_session.h src/xmpp/muc.c src/xmpp/muc.h src/xmpp/jid.h src/xmpp/jid.c \ src/xmpp/chat_state.h src/xmpp/chat_state.c \ src/resource.c src/resource.h \ src/roster_list.c src/roster_list.h \ @@ -60,7 +60,7 @@ unittest_sources = \ src/xmpp/contact.c src/xmpp/contact.h src/common.c \ src/log.h src/profanity.c src/common.h \ src/profanity.h src/xmpp/chat_session.c \ - src/xmpp/chat_session.h src/muc.c src/muc.h src/xmpp/jid.h src/xmpp/jid.c \ + src/xmpp/chat_session.h src/xmpp/muc.c src/xmpp/muc.h src/xmpp/jid.h src/xmpp/jid.c \ src/resource.c src/resource.h \ src/xmpp/chat_state.h src/xmpp/chat_state.c \ src/roster_list.c src/roster_list.h \ diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index 69e350bc..2c8c02dd 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -46,7 +46,7 @@ #include "command/cmd_funcs.h" #include "config/preferences.h" #include "config/scripts.h" -#include "muc.h" +#include "xmpp/muc.h" #include "xmpp/xmpp.h" #include "roster_list.h" #include "window_list.h" diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index 852a3cf8..5ade93e3 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -62,7 +62,7 @@ #include "roster_list.h" #include "xmpp/jid.h" #include "log.h" -#include "muc.h" +#include "xmpp/muc.h" #include "plugins/plugins.h" #include "profanity.h" #include "tools/autocomplete.h" diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index b9f9cb14..d7f4c8dc 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -64,7 +64,7 @@ #include "roster_list.h" #include "xmpp/jid.h" #include "log.h" -#include "muc.h" +#include "xmpp/muc.h" #ifdef HAVE_LIBOTR #include "otr/otr.h" #endif diff --git a/src/event/server_events.c b/src/event/server_events.c index 0d511836..a12e5a37 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -40,7 +40,7 @@ #include "xmpp/chat_session.h" #include "log.h" -#include "muc.h" +#include "xmpp/muc.h" #include "config/preferences.h" #include "config/account.h" #include "config/scripts.h" diff --git a/src/profanity.c b/src/profanity.c index 057fbf84..8dec09cf 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -60,7 +60,7 @@ #include "roster_list.h" #include "config/tlscerts.h" #include "log.h" -#include "muc.h" +#include "xmpp/muc.h" #include "plugins/plugins.h" #ifdef HAVE_LIBOTR #include "otr/otr.h" diff --git a/src/ui/console.c b/src/ui/console.c index 3e987dbe..182e365f 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -46,7 +46,7 @@ #include "command/cmd_defs.h" #include "common.h" #include "log.h" -#include "muc.h" +#include "xmpp/muc.h" #include "roster_list.h" #include "config/preferences.h" #include "config/theme.h" diff --git a/src/ui/core.c b/src/ui/core.c index d90d1aa6..cef4cc22 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -64,7 +64,7 @@ #include "roster_list.h" #include "xmpp/jid.h" #include "log.h" -#include "muc.h" +#include "xmpp/muc.h" #ifdef HAVE_LIBOTR #include "otr/otr.h" #endif diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 65e33c9f..4cd8f3e1 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -60,7 +60,7 @@ #include "config/preferences.h" #include "config/theme.h" #include "log.h" -#include "muc.h" +#include "xmpp/muc.h" #include "profanity.h" #include "roster_list.h" #include "ui/ui.h" diff --git a/src/ui/notifier.c b/src/ui/notifier.c index 355c06c2..f992729a 100644 --- a/src/ui/notifier.c +++ b/src/ui/notifier.c @@ -46,7 +46,7 @@ #endif #include "log.h" -#include "muc.h" +#include "xmpp/muc.h" #include "ui/ui.h" #include "window_list.h" #include "config/preferences.h" diff --git a/src/ui/ui.h b/src/ui/ui.h index 65209659..3e4292c9 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -39,7 +39,7 @@ #include "command/cmd_funcs.h" #include "ui/win_types.h" -#include "muc.h" +#include "xmpp/muc.h" #include "config/tlscerts.h" #include "config/account.h" #ifdef HAVE_LIBOTR diff --git a/src/ui/window.h b/src/ui/window.h index 3334c708..c570e6c7 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -40,7 +40,7 @@ #include #include "xmpp/contact.h" -#include "muc.h" +#include "xmpp/muc.h" #include "ui/ui.h" #include "ui/buffer.h" #include "xmpp/xmpp.h" diff --git a/src/muc.c b/src/xmpp/muc.c similarity index 100% rename from src/muc.c rename to src/xmpp/muc.c diff --git a/src/muc.h b/src/xmpp/muc.h similarity index 99% rename from src/muc.h rename to src/xmpp/muc.h index 7bacb18d..b5d9a38b 100644 --- a/src/muc.h +++ b/src/xmpp/muc.h @@ -32,8 +32,8 @@ * */ -#ifndef MUC_H -#define MUC_H +#ifndef XMPP_MUC_H +#define XMPP_MUC_H #include diff --git a/tests/unittests/test_cmd_bookmark.c b/tests/unittests/test_cmd_bookmark.c index 5b17c6e0..f7a2cc4b 100644 --- a/tests/unittests/test_cmd_bookmark.c +++ b/tests/unittests/test_cmd_bookmark.c @@ -11,7 +11,7 @@ #include "ui/ui.h" #include "ui/stub_ui.h" -#include "muc.h" +#include "xmpp/muc.h" #include "common.h" #include "command/cmd_funcs.h" diff --git a/tests/unittests/test_cmd_join.c b/tests/unittests/test_cmd_join.c index 709b4145..dc24a009 100644 --- a/tests/unittests/test_cmd_join.c +++ b/tests/unittests/test_cmd_join.c @@ -14,7 +14,7 @@ #include "config/accounts.h" #include "command/cmd_funcs.h" -#include "muc.h" +#include "xmpp/muc.h" #define CMD_JOIN "/join" diff --git a/tests/unittests/test_muc.c b/tests/unittests/test_muc.c index e3b7f9b0..888ce039 100644 --- a/tests/unittests/test_muc.c +++ b/tests/unittests/test_muc.c @@ -4,7 +4,7 @@ #include #include -#include "muc.h" +#include "xmpp/muc.h" void muc_before_test(void **state) { diff --git a/tests/unittests/test_server_events.c b/tests/unittests/test_server_events.c index a5ef365e..86f8515e 100644 --- a/tests/unittests/test_server_events.c +++ b/tests/unittests/test_server_events.c @@ -12,7 +12,7 @@ #include "config/preferences.h" #include "ui/ui.h" #include "ui/stub_ui.h" -#include "muc.h" +#include "xmpp/muc.h" void console_shows_online_presence_when_set_online(void **state) {