about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2016-07-24 14:55:32 +0100
committerJames Booth <boothj5@gmail.com>2016-07-24 14:55:32 +0100
commitc23506f453c36c9133d1f176624541ef84385ced (patch)
treecfbdc0edf77c900416e3fa072ec8afabaf18387d /src
parent9cff37352a0200dbe0acb1b6a9e5810ee33743ea (diff)
downloadprofani-tty-c23506f453c36c9133d1f176624541ef84385ced.tar.gz
Moved contact.c
Diffstat (limited to 'src')
-rw-r--r--src/command/cmd_defs.c2
-rw-r--r--src/command/cmd_funcs.c2
-rw-r--r--src/muc.c2
-rw-r--r--src/muc.h2
-rw-r--r--src/otr/otr.c2
-rw-r--r--src/profanity.c2
-rw-r--r--src/roster_list.c2
-rw-r--r--src/roster_list.h2
-rw-r--r--src/ui/core.c2
-rw-r--r--src/ui/rosterwin.c2
-rw-r--r--src/ui/window.h2
-rw-r--r--src/xmpp/contact.c (renamed from src/contact.c)0
-rw-r--r--src/xmpp/contact.h (renamed from src/contact.h)4
13 files changed, 13 insertions, 13 deletions
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index 9f1f31ff..d390a64a 100644
--- a/src/command/cmd_defs.c
+++ b/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"
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 8d1d27a9..f661e6a9 100644
--- a/src/command/cmd_funcs.c
+++ b/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"
diff --git a/src/muc.c b/src/muc.c
index 3cab42ec..642e71f4 100644
--- a/src/muc.c
+++ b/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"
diff --git a/src/muc.h b/src/muc.h
index f93a0908..a2482fd9 100644
--- a/src/muc.h
+++ b/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"
diff --git a/src/otr/otr.c b/src/otr/otr.c
index c9769d35..2ece01f3 100644
--- a/src/otr/otr.c
+++ b/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"
diff --git a/src/profanity.c b/src/profanity.c
index 383753e3..057fbf84 100644
--- a/src/profanity.c
+++ b/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"
diff --git a/src/roster_list.c b/src/roster_list.c
index a78ff066..4044a09e 100644
--- a/src/roster_list.c
+++ b/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"
diff --git a/src/roster_list.h b/src/roster_list.h
index 59945353..1b695b76 100644
--- a/src/roster_list.h
+++ b/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,
diff --git a/src/ui/core.c b/src/ui/core.c
index 9ee3c4c3..a1b14904 100644
--- a/src/ui/core.c
+++ b/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"
diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c
index d75e2186..c8c0ae52 100644
--- a/src/ui/rosterwin.c
+++ b/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"
diff --git a/src/ui/window.h b/src/ui/window.h
index 6faacb46..3334c708 100644
--- a/src/ui/window.h
+++ b/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"
diff --git a/src/contact.c b/src/xmpp/contact.c
index 000d7668..000d7668 100644
--- a/src/contact.c
+++ b/src/xmpp/contact.c
diff --git a/src/contact.h b/src/xmpp/contact.h
index 14122b40..6a13d01e 100644
--- a/src/contact.h
+++ b/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"