about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2016-07-24 15:05:24 +0100
committerJames Booth <boothj5@gmail.com>2016-07-24 15:05:24 +0100
commitcc32bb773811cbdc098f27ce32cb389e6a0163a9 (patch)
treec185bc76e54f9525fb68f249e5b70e3e640f6c91 /src
parent2af0d38e3d9b766ec1fd1bd85edd899d01047a2b (diff)
downloadprofani-tty-cc32bb773811cbdc098f27ce32cb389e6a0163a9.tar.gz
Moved resource.c
Diffstat (limited to 'src')
-rw-r--r--src/profanity.c2
-rw-r--r--src/roster_list.c2
-rw-r--r--src/roster_list.h2
-rw-r--r--src/xmpp/resource.c (renamed from src/resource.c)4
-rw-r--r--src/xmpp/resource.h (renamed from src/resource.h)4
5 files changed, 7 insertions, 7 deletions
diff --git a/src/profanity.c b/src/profanity.c
index 8dec09cf..5955ae72 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -68,7 +68,7 @@
 #ifdef HAVE_LIBGPGME
 #include "pgp/gpg.h"
 #endif
-#include "resource.h"
+#include "xmpp/resource.h"
 #include "xmpp/xmpp.h"
 #include "ui/ui.h"
 #include "window_list.h"
diff --git a/src/roster_list.c b/src/roster_list.c
index 816eed27..789449c2 100644
--- a/src/roster_list.c
+++ b/src/roster_list.c
@@ -40,7 +40,7 @@
 #include <assert.h>
 
 #include "roster_list.h"
-#include "resource.h"
+#include "xmpp/resource.h"
 #include "xmpp/contact.h"
 #include "xmpp/jid.h"
 #include "tools/autocomplete.h"
diff --git a/src/roster_list.h b/src/roster_list.h
index 1b695b76..70dd540f 100644
--- a/src/roster_list.h
+++ b/src/roster_list.h
@@ -37,7 +37,7 @@
 
 #include <glib.h>
 
-#include "resource.h"
+#include "xmpp/resource.h"
 #include "xmpp/contact.h"
 
 typedef enum {
diff --git a/src/resource.c b/src/xmpp/resource.c
index 2c448882..6e6bc5f0 100644
--- a/src/resource.c
+++ b/src/xmpp/resource.c
@@ -36,8 +36,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <common.h>
-#include <resource.h>
+#include "common.h"
+#include "xmpp/resource.h"
 
 Resource*
 resource_new(const char *const name, resource_presence_t presence, const char *const status, const int priority)
diff --git a/src/resource.h b/src/xmpp/resource.h
index c7b00c6a..22681013 100644
--- a/src/resource.h
+++ b/src/xmpp/resource.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef RESOURCE_H
-#define RESOURCE_H
+#ifndef XMPP_RESOURCE_H
+#define XMPP_RESOURCE_H
 
 #include "common.h"