Moved muc.c

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"

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"

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

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"

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"

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"

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

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"

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"

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

src/ui/window.h

@@ -40,7 +40,7 @@
 #include <wchar.h>
 
 #include "xmpp/contact.h"
-#include "muc.h"
+#include "xmpp/muc.h"
 #include "ui/ui.h"
 #include "ui/buffer.h"
 #include "xmpp/xmpp.h"

src/xmpp/muc.h

@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef MUC_H
-#define MUC_H
+#ifndef XMPP_MUC_H
+#define XMPP_MUC_H
 
 #include <glib.h>