Moved chat_session.c

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"

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"

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"

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"

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"

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

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"

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"

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"

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;

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>