about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--src/profanity.c2
-rw-r--r--src/ui/inputwin.c2
-rw-r--r--src/ui/win_types.h2
-rw-r--r--src/ui/window.h2
-rw-r--r--src/xmpp/chat_state.c (renamed from src/chat_state.c)0
-rw-r--r--src/xmpp/chat_state.h (renamed from src/chat_state.h)0
7 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 2491ee6d..6311cef6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ core_sources = \
 	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/jid.h src/jid.c \
-	src/chat_state.h src/chat_state.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 \
 	src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/session.c \
@@ -62,7 +62,7 @@ unittest_sources = \
 	src/profanity.h src/xmpp/chat_session.c \
 	src/xmpp/chat_session.h src/muc.c src/muc.h src/jid.h src/jid.c \
 	src/resource.c src/resource.h \
-	src/chat_state.h src/chat_state.c \
+	src/xmpp/chat_state.h src/xmpp/chat_state.c \
 	src/roster_list.c src/roster_list.h \
 	src/xmpp/xmpp.h src/xmpp/form.c \
 	src/ui/ui.h \
diff --git a/src/profanity.c b/src/profanity.c
index 5799568c..383753e3 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -49,7 +49,7 @@
 
 #include "profanity.h"
 #include "xmpp/chat_session.h"
-#include "chat_state.h"
+#include "xmpp/chat_state.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
 #include "config/theme.h"
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 10035d37..65e33c9f 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -54,7 +54,7 @@
 #endif
 
 #include "command/cmd_ac.h"
-#include "chat_state.h"
+#include "xmpp/chat_state.h"
 #include "common.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
diff --git a/src/ui/win_types.h b/src/ui/win_types.h
index e06e4cc6..b523ef2f 100644
--- a/src/ui/win_types.h
+++ b/src/ui/win_types.h
@@ -46,7 +46,7 @@
 #endif
 
 #include "ui/buffer.h"
-#include "chat_state.h"
+#include "xmpp/chat_state.h"
 #include "tools/autocomplete.h"
 
 #define LAYOUT_SPLIT_MEMCHECK       12345671
diff --git a/src/ui/window.h b/src/ui/window.h
index b3b86570..6faacb46 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -44,7 +44,7 @@
 #include "ui/ui.h"
 #include "ui/buffer.h"
 #include "xmpp/xmpp.h"
-#include "chat_state.h"
+#include "xmpp/chat_state.h"
 
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
diff --git a/src/chat_state.c b/src/xmpp/chat_state.c
index 836d313f..836d313f 100644
--- a/src/chat_state.c
+++ b/src/xmpp/chat_state.c
diff --git a/src/chat_state.h b/src/xmpp/chat_state.h
index 393598ba..393598ba 100644
--- a/src/chat_state.h
+++ b/src/xmpp/chat_state.h