summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-08-26 12:26:06 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-08-28 11:09:03 +0100
commit5659b40c747817bcdf841ea1d6e208da6382758b (patch)
treecba02c3c319c62419f29191c79caf7156f17ec0d
parent9a5e32f52df7712faef82edf929d14f6b1db0c9a (diff)
rename wocky-contact.[ch] to wocky-bare-contact.[ch]
-rw-r--r--tests/wocky-contact-test.c2
-rw-r--r--tests/wocky-roster-test.c2
-rw-r--r--wocky/Makefile.am4
-rw-r--r--wocky/wocky-bare-contact.c (renamed from wocky/wocky-contact.c)4
-rw-r--r--wocky/wocky-bare-contact.h (renamed from wocky/wocky-contact.h)2
-rw-r--r--wocky/wocky-roster.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/tests/wocky-contact-test.c b/tests/wocky-contact-test.c
index 5832a4d..934182b 100644
--- a/tests/wocky-contact-test.c
+++ b/tests/wocky-contact-test.c
@@ -4,7 +4,7 @@
#include <glib.h>
-#include <wocky/wocky-contact.h>
+#include <wocky/wocky-bare-contact.h>
#include <wocky/wocky-utils.h>
#include "wocky-test-helper.h"
diff --git a/tests/wocky-roster-test.c b/tests/wocky-roster-test.c
index 98df10a..541e115 100644
--- a/tests/wocky-roster-test.c
+++ b/tests/wocky-roster-test.c
@@ -8,7 +8,7 @@
#include <wocky/wocky-porter.h>
#include <wocky/wocky-utils.h>
#include <wocky/wocky-xmpp-connection.h>
-#include <wocky/wocky-contact.h>
+#include <wocky/wocky-bare-contact.h>
#include <wocky/wocky-namespaces.h>
#include "wocky-test-stream.h"
diff --git a/wocky/Makefile.am b/wocky/Makefile.am
index 31f50a4..2a61301 100644
--- a/wocky/Makefile.am
+++ b/wocky/Makefile.am
@@ -39,8 +39,8 @@ HANDWRITTEN_SOURCES = \
wocky-sasl-auth.h \
wocky-porter.c \
wocky-porter.h \
- wocky-contact.c \
- wocky-contact.h \
+ wocky-bare-contact.c \
+ wocky-bare-contact.h \
wocky-roster.c \
wocky-roster.h
diff --git a/wocky/wocky-contact.c b/wocky/wocky-bare-contact.c
index 40eece9..d3db560 100644
--- a/wocky/wocky-contact.c
+++ b/wocky/wocky-bare-contact.c
@@ -1,5 +1,5 @@
/*
- * wocky-contact.c - Source for WockyContact
+ * wocky-bare-contact.c - Source for WockyContact
* Copyright (C) 2009 Collabora Ltd.
* @author Jonny Lamb <jonny.lamb@collabora.co.uk>
*
@@ -35,7 +35,7 @@
#include <gio/gio.h>
-#include "wocky-contact.h"
+#include "wocky-bare-contact.h"
#include "wocky-signals-marshal.h"
#include "wocky-utils.h"
diff --git a/wocky/wocky-contact.h b/wocky/wocky-bare-contact.h
index 40eb605..c4eb4cc 100644
--- a/wocky/wocky-contact.h
+++ b/wocky/wocky-bare-contact.h
@@ -1,5 +1,5 @@
/*
- * wocky-contact.h - Header for WockyContact
+ * wocky-bare-contact.h - Header for WockyContact
* Copyright (C) 2009 Collabora Ltd.
* @author Jonny Lamb <jonny.lamb@collabora.co.uk>
*
diff --git a/wocky/wocky-roster.c b/wocky/wocky-roster.c
index e6e3214..dc7e082 100644
--- a/wocky/wocky-roster.c
+++ b/wocky/wocky-roster.c
@@ -32,7 +32,7 @@
#include "wocky-roster.h"
-#include "wocky-contact.h"
+#include "wocky-bare-contact.h"
#include "wocky-namespaces.h"
#include "wocky-xmpp-stanza.h"
#include "wocky-utils.h"