Moved jid.c

src/command/cmd_defs.c

@@ -60,7 +60,7 @@
 #include "config/scripts.h"
 #include "xmpp/contact.h"
 #include "roster_list.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "log.h"
 #include "muc.h"
 #include "plugins/plugins.h"

src/command/cmd_funcs.c

@@ -62,7 +62,7 @@
 #include "config/scripts.h"
 #include "xmpp/contact.h"
 #include "roster_list.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "log.h"
 #include "muc.h"
 #ifdef HAVE_LIBOTR

src/config/account.c

@@ -38,7 +38,7 @@
 
 #include <glib.h>
 
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "config/account.h"
 #include "common.h"
 #include "log.h"

src/config/accounts.c

@@ -43,7 +43,7 @@
 #include "common.h"
 #include "config/account.h"
 #include "config/conflists.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "log.h"
 #include "tools/autocomplete.h"
 #include "xmpp/xmpp.h"

src/muc.c

@@ -40,7 +40,7 @@
 
 #include "xmpp/contact.h"
 #include "common.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "tools/autocomplete.h"
 #include "ui/ui.h"
 #include "window_list.h"

src/muc.h

@@ -38,7 +38,7 @@
 #include <glib.h>
 
 #include "xmpp/contact.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "tools/autocomplete.h"
 #include "ui/win_types.h"
 

src/roster_list.c

@@ -42,7 +42,7 @@
 #include "roster_list.h"
 #include "resource.h"
 #include "xmpp/contact.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "tools/autocomplete.h"
 #include "config/preferences.h"
 

src/ui/core.c

@@ -62,7 +62,7 @@
 #include "config/theme.h"
 #include "xmpp/contact.h"
 #include "roster_list.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "log.h"
 #include "muc.h"
 #ifdef HAVE_LIBOTR

src/xmpp/jid.h

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