about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am8
-rw-r--r--src/chat_state.c2
-rw-r--r--src/command/cmd_defs.c2
-rw-r--r--src/command/cmd_funcs.c2
-rw-r--r--src/event/client_events.c2
-rw-r--r--src/event/server_events.c2
-rw-r--r--src/otr/otr.c2
-rw-r--r--src/profanity.c2
-rw-r--r--src/ui/chatwin.c2
-rw-r--r--src/ui/core.c2
-rw-r--r--src/ui/titlebar.c2
-rw-r--r--src/xmpp/chat_session.c (renamed from src/chat_session.c)0
-rw-r--r--src/xmpp/chat_session.h (renamed from src/chat_session.h)4
-rw-r--r--tests/unittests/helpers.c2
-rw-r--r--tests/unittests/test_chat_session.c4
-rw-r--r--tests/unittests/test_cmd_disconnect.c2
-rw-r--r--tests/unittests/test_server_events.c2
-rw-r--r--tests/unittests/unittests.c2
18 files changed, 22 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am
index bcd964a1..2491ee6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 core_sources = \
 	src/contact.c src/contact.h src/log.c src/common.c \
 	src/log.h src/profanity.c src/common.h \
-	src/profanity.h src/chat_session.c \
-	src/chat_session.h src/muc.c src/muc.h src/jid.h src/jid.c \
+	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/resource.c src/resource.h \
 	src/roster_list.c src/roster_list.h \
@@ -59,8 +59,8 @@ core_sources = \
 unittest_sources = \
 	src/contact.c src/contact.h src/common.c \
 	src/log.h src/profanity.c src/common.h \
-	src/profanity.h src/chat_session.c \
-	src/chat_session.h src/muc.c src/muc.h src/jid.h src/jid.c \
+	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/roster_list.c src/roster_list.h \
diff --git a/src/chat_state.c b/src/chat_state.c
index cac73817..836d313f 100644
--- a/src/chat_state.c
+++ b/src/chat_state.c
@@ -38,7 +38,7 @@
 #include <glib.h>
 
 #include "chat_state.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "window_list.h"
 #include "ui/win_types.h"
 #include "xmpp/xmpp.h"
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index 34f840ed..9f1f31ff 100644
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -48,7 +48,7 @@
 
 #include <glib.h>
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "command/cmd_defs.h"
 #include "command/cmd_funcs.h"
 #include "command/cmd_ac.h"
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 65982541..8d1d27a9 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -49,7 +49,7 @@
 #include <langinfo.h>
 #include <ctype.h>
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "command/cmd_funcs.h"
 #include "command/cmd_defs.h"
 #include "command/cmd_ac.h"
diff --git a/src/event/client_events.c b/src/event/client_events.c
index 65843c44..ebbdd1ed 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -42,7 +42,7 @@
 #include "window_list.h"
 #include "xmpp/xmpp.h"
 #include "roster_list.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "plugins/plugins.h"
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
diff --git a/src/event/server_events.c b/src/event/server_events.c
index c73bcbdd..0d511836 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "log.h"
 #include "muc.h"
 #include "config/preferences.h"
diff --git a/src/otr/otr.c b/src/otr/otr.c
index b3ce4e5f..c9769d35 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -47,7 +47,7 @@
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
 #include "config/preferences.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 
 #define PRESENCE_ONLINE 1
 #define PRESENCE_OFFLINE 0
diff --git a/src/profanity.c b/src/profanity.c
index ed534d11..5799568c 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -48,7 +48,7 @@
 #include <glib.h>
 
 #include "profanity.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "chat_state.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index 25df09c4..b1de9489 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "window_list.h"
 #include "roster_list.h"
 #include "log.h"
diff --git a/src/ui/core.c b/src/ui/core.c
index df759ca6..9ee3c4c3 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -54,7 +54,7 @@
 #include <ncurses.h>
 #endif
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "command/cmd_defs.h"
 #include "command/cmd_ac.h"
 #include "common.h"
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index a2817698..3381f99e 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -47,7 +47,7 @@
 #include "window_list.h"
 #include "ui/window.h"
 #include "roster_list.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 
 static WINDOW *win;
 static contact_presence_t current_presence;
diff --git a/src/chat_session.c b/src/xmpp/chat_session.c
index 7e844871..7e844871 100644
--- a/src/chat_session.c
+++ b/src/xmpp/chat_session.c
diff --git a/src/chat_session.h b/src/xmpp/chat_session.h
index 604d2319..705799a1 100644
--- a/src/chat_session.h
+++ b/src/xmpp/chat_session.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef CHAT_SESSION_H
-#define CHAT_SESSION_H
+#ifndef XMPP_CHAT_SESSION_H
+#define XMPP_CHAT_SESSION_H
 
 #include <glib.h>
 
diff --git a/tests/unittests/helpers.c b/tests/unittests/helpers.c
index 9cabb1e4..1494d803 100644
--- a/tests/unittests/helpers.c
+++ b/tests/unittests/helpers.c
@@ -10,7 +10,7 @@
 #include "common.h"
 #include "helpers.h"
 #include "config/preferences.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 
 void create_config_dir(void **state)
 {
diff --git a/tests/unittests/test_chat_session.c b/tests/unittests/test_chat_session.c
index b5e1f7b6..fd934737 100644
--- a/tests/unittests/test_chat_session.c
+++ b/tests/unittests/test_chat_session.c
@@ -5,7 +5,7 @@
 #include <cmocka.h>
 #include <stdlib.h>
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 
 void returns_false_when_chat_session_does_not_exist(void **state)
 {
@@ -48,4 +48,4 @@ void removes_chat_session(void **state)
     ChatSession *session = chat_session_get(barejid);
 
     assert_null(session);
-}
\ No newline at end of file
+}
diff --git a/tests/unittests/test_cmd_disconnect.c b/tests/unittests/test_cmd_disconnect.c
index 9bf78a7a..bfd81b48 100644
--- a/tests/unittests/test_cmd_disconnect.c
+++ b/tests/unittests/test_cmd_disconnect.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "command/cmd_funcs.h"
 #include "xmpp/xmpp.h"
 #include "roster_list.h"
diff --git a/tests/unittests/test_server_events.c b/tests/unittests/test_server_events.c
index b565dd9f..a5ef365e 100644
--- a/tests/unittests/test_server_events.c
+++ b/tests/unittests/test_server_events.c
@@ -8,7 +8,7 @@
 
 #include "event/server_events.h"
 #include "roster_list.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "config/preferences.h"
 #include "ui/ui.h"
 #include "ui/stub_ui.h"
diff --git a/tests/unittests/unittests.c b/tests/unittests/unittests.c
index 91fb3cb2..ea479a94 100644
--- a/tests/unittests/unittests.c
+++ b/tests/unittests/unittests.c
@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 
 #include "config.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "helpers.h"
 #include "test_autocomplete.h"
 #include "test_chat_session.h"
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-06-15 14:11:05 +0000