Moved contact.c

Makefile.am

@@ -1,5 +1,5 @@
 core_sources = \
-	src/contact.c src/contact.h src/log.c src/common.c \
+	src/xmpp/contact.c src/xmpp/contact.h src/log.c src/common.c \
 	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 \
@@ -57,7 +57,7 @@ core_sources = \
 	src/tray.h src/tray.c
 
 unittest_sources = \
-	src/contact.c src/contact.h src/common.c \
+	src/xmpp/contact.c src/xmpp/contact.h src/common.c \
 	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/command/cmd_defs.c

@@ -58,7 +58,7 @@
 #include "config/theme.h"
 #include "config/tlscerts.h"
 #include "config/scripts.h"
-#include "contact.h"
+#include "xmpp/contact.h"
 #include "roster_list.h"
 #include "jid.h"
 #include "log.h"

src/command/cmd_funcs.c

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

src/muc.c

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

src/muc.h

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

src/otr/otr.c

@@ -43,7 +43,7 @@
 #include "log.h"
 #include "roster_list.h"
 #include "window_list.h"
-#include "contact.h"
+#include "xmpp/contact.h"
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
 #include "config/preferences.h"

src/profanity.c

@@ -56,7 +56,7 @@
 #include "config/scripts.h"
 #include "command/cmd_defs.h"
 #include "common.h"
-#include "contact.h"
+#include "xmpp/contact.h"
 #include "roster_list.h"
 #include "config/tlscerts.h"
 #include "log.h"

src/roster_list.c

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

src/roster_list.h

@@ -38,7 +38,7 @@
 #include <glib.h>
 
 #include "resource.h"
-#include "contact.h"
+#include "xmpp/contact.h"
 
 typedef enum {
     ROSTER_ORD_NAME,

src/ui/core.c

@@ -60,7 +60,7 @@
 #include "common.h"
 #include "config/preferences.h"
 #include "config/theme.h"
-#include "contact.h"
+#include "xmpp/contact.h"
 #include "roster_list.h"
 #include "jid.h"
 #include "log.h"

src/ui/rosterwin.c

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "contact.h"
+#include "xmpp/contact.h"
 #include "ui/ui.h"
 #include "ui/window.h"
 #include "window_list.h"

src/ui/window.h

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

src/xmpp/contact.h

@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef CONTACT_H
-#define CONTACT_H
+#ifndef XMPP_CONTACT_H
+#define XMPP_CONTACT_H
 
 #include "resource.h"
 #include "tools/autocomplete.h"

tests/unittests/test_autocomplete.c

@@ -5,7 +5,7 @@
 #include <cmocka.h>
 #include <stdlib.h>
 
-#include "contact.h"
+#include "xmpp/contact.h"
 #include "tools/autocomplete.h"
 
 void clear_empty(void **state)

tests/unittests/test_contact.c

@@ -6,7 +6,7 @@
 #include <cmocka.h>
 #include <stdlib.h>
 
-#include "contact.h"
+#include "xmpp/contact.h"
 
 void contact_in_group(void **state)
 {

tests/unittests/test_roster_list.c

@@ -6,7 +6,7 @@
 #include <cmocka.h>
 #include <stdlib.h>
 
-#include "contact.h"
+#include "xmpp/contact.h"
 #include "roster_list.h"
 
 void empty_list_when_none_added(void **state)