loopback-connection: rename to loopback-stream

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

6 files changed, 104 insertions, 104 deletions

diff --git a/tests/wocky-loopback-test.c b/tests/wocky-loopback-test.c
index c1dddee..712fc3e 100644
--- a/tests/wocky-loopback-test.c
+++ b/tests/wocky-loopback-test.c
@@ -1,5 +1,5 @@
 #include <wocky/wocky-c2s-porter.h>
-#include <wocky/wocky-loopback-connection.h>
+#include <wocky/wocky-loopback-stream.h>
 
 #include "wocky-test-helper.h"
 
@@ -33,7 +33,7 @@ setup (void)
   test->data.timeout_id = g_timeout_add_seconds (10, test_timeout, NULL);
   test->data.expected_stanzas = g_queue_new ();
 
-  test->stream = wocky_loopback_connection_new ();
+  test->stream = wocky_loopback_stream_new ();
 
   test->conn = wocky_xmpp_connection_new (test->stream);
 
diff --git a/wocky/Makefile.am b/wocky/Makefile.am
index bb9bd22..d5f9299 100644
--- a/wocky/Makefile.am
+++ b/wocky/Makefile.am
@@ -63,7 +63,7 @@ handwritten_headers = \
   wocky-jabber-auth-password.h \
   wocky-ll-connector.h \
   wocky-ll-contact.h \
-  wocky-loopback-connection.h \
+  wocky-loopback-stream.h \
   wocky-meta-porter.h \
   wocky-muc.h \
   wocky-namespaces.h \
@@ -116,7 +116,7 @@ handwritten_sources = \
   wocky-jabber-auth-password.c \
   wocky-ll-connector.c \
   wocky-ll-contact.c \
-  wocky-loopback-connection.c \
+  wocky-loopback-stream.c \
   wocky-meta-porter.c \
   wocky-muc.c \
   wocky-node.c \
diff --git a/wocky/wocky-loopback-connection.h b/wocky/wocky-loopback-connection.h
deleted file mode 100644
index 949750b..0000000
--- a/wocky/wocky-loopback-connection.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * wocky-loopback-connection.h - Header for WockyLoopbackConnection
- * Copyright (C) 2009-2011 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __WOCKY_LOOPBACK_CONNECTION_H__
-#define __WOCKY_LOOPBACK_CONNECTION_H__
-
-#include <glib-object.h>
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-typedef struct _WockyLoopbackConnection WockyLoopbackConnection;
-typedef struct _WockyLoopbackConnectionClass WockyLoopbackConnectionClass;
-typedef struct _WockyLoopbackConnectionPrivate WockyLoopbackConnectionPrivate;
-
-struct _WockyLoopbackConnectionClass
-{
-  GIOStreamClass parent_class;
-};
-
-struct _WockyLoopbackConnection
-{
-  GIOStream parent;
-
-  WockyLoopbackConnectionPrivate *priv;
-};
-
-GType wocky_loopback_connection_get_type (void);
-
-/* TYPE MACROS */
-#define WOCKY_TYPE_LOOPBACK_CONNECTION \
-  (wocky_loopback_connection_get_type ())
-#define WOCKY_LOOPBACK_CONNECTION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_LOOPBACK_CONNECTION, \
-      WockyLoopbackConnection))
-#define WOCKY_LOOPBACK_CONNECTION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), WOCKY_TYPE_LOOPBACK_CONNECTION, \
-      WockyLoopbackConnectionClass))
-#define WOCKY_IS_LOOPBACK_CONNECTION(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_LOOPBACK_CONNECTION))
-#define WOCKY_IS_LOOPBACK_CONNECTION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), WOCKY_TYPE_LOOPBACK_CONNECTION))
-#define WOCKY_LOOPBACK_CONNECTION_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_LOOPBACK_CONNECTION, \
-      WockyLoopbackConnectionClass))
-
-GIOStream * wocky_loopback_connection_new (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __WOCKY_LOOPBACK_CONNECTION_H__*/
diff --git a/wocky/wocky-loopback-connection.c b/wocky/wocky-loopback-stream.c
index be628e6..64bc6b2 100644
--- a/wocky/wocky-loopback-connection.c
+++ b/wocky/wocky-loopback-stream.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "wocky-loopback-connection.h"
+#include "wocky-loopback-stream.h"
 
 enum {
   PROP_IO_INPUT_STREAM = 1,
@@ -31,7 +31,7 @@ enum {
 static GType wocky_loopback_input_stream_get_type (void);
 static GType wocky_loopback_output_stream_get_type (void);
 
-struct _WockyLoopbackConnectionPrivate
+struct _WockyLoopbackStreamPrivate
 {
   GInputStream *input;
   GOutputStream *output;
@@ -71,7 +71,7 @@ typedef struct
 } WockyLoopbackInputStreamClass;
 
 
-G_DEFINE_TYPE (WockyLoopbackConnection, wocky_loopback_connection,
+G_DEFINE_TYPE (WockyLoopbackStream, wocky_loopback_stream,
     G_TYPE_IO_STREAM);
 G_DEFINE_TYPE (WockyLoopbackInputStream, wocky_loopback_input_stream,
   G_TYPE_INPUT_STREAM);
@@ -100,12 +100,12 @@ output_data_written_cb (GOutputStream *output,
 
 /* connection */
 static void
-wocky_loopback_connection_init (WockyLoopbackConnection *self)
+wocky_loopback_stream_init (WockyLoopbackStream *self)
 {
-  WockyLoopbackConnectionPrivate *priv;
+  WockyLoopbackStreamPrivate *priv;
 
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, WOCKY_TYPE_LOOPBACK_CONNECTION,
-      WockyLoopbackConnectionPrivate);
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, WOCKY_TYPE_LOOPBACK_STREAM,
+      WockyLoopbackStreamPrivate);
   priv = self->priv;
 
   priv->output = g_object_new (WOCKY_TYPE_LOOPBACK_OUTPUT_STREAM, NULL);
@@ -120,13 +120,13 @@ wocky_loopback_connection_init (WockyLoopbackConnection *self)
 }
 
 static void
-wocky_loopback_connection_get_property (GObject *object,
+wocky_loopback_stream_get_property (GObject *object,
     guint property_id,
     GValue *value,
     GParamSpec *pspec)
 {
-  WockyLoopbackConnection *self = WOCKY_LOOPBACK_CONNECTION (object);
-  WockyLoopbackConnectionPrivate *priv = self->priv;
+  WockyLoopbackStream *self = WOCKY_LOOPBACK_STREAM (object);
+  WockyLoopbackStreamPrivate *priv = self->priv;
 
   switch (property_id)
     {
@@ -143,46 +143,46 @@ wocky_loopback_connection_get_property (GObject *object,
 }
 
 static void
-wocky_loopback_connection_dispose (GObject *object)
+wocky_loopback_stream_dispose (GObject *object)
 {
-  WockyLoopbackConnection *self = WOCKY_LOOPBACK_CONNECTION (object);
-  WockyLoopbackConnectionPrivate *priv = self->priv;
+  WockyLoopbackStream *self = WOCKY_LOOPBACK_STREAM (object);
+  WockyLoopbackStreamPrivate *priv = self->priv;
 
-  if (G_OBJECT_CLASS (wocky_loopback_connection_parent_class)->dispose)
-    G_OBJECT_CLASS (wocky_loopback_connection_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (wocky_loopback_stream_parent_class)->dispose)
+    G_OBJECT_CLASS (wocky_loopback_stream_parent_class)->dispose (object);
 
   g_object_unref (priv->input);
   g_object_unref (priv->output);
 }
 
 static GInputStream *
-wocky_loopback_connection_get_input_stream (GIOStream *stream)
+wocky_loopback_stream_get_input_stream (GIOStream *stream)
 {
-  return WOCKY_LOOPBACK_CONNECTION (stream)->priv->input;
+  return WOCKY_LOOPBACK_STREAM (stream)->priv->input;
 }
 
 static GOutputStream *
-wocky_loopback_connection_get_output_stream (GIOStream *stream)
+wocky_loopback_stream_get_output_stream (GIOStream *stream)
 {
-  return WOCKY_LOOPBACK_CONNECTION (stream)->priv->output;
+  return WOCKY_LOOPBACK_STREAM (stream)->priv->output;
 }
 
 static void
-wocky_loopback_connection_class_init (
-    WockyLoopbackConnectionClass *wocky_loopback_connection_class)
+wocky_loopback_stream_class_init (
+    WockyLoopbackStreamClass *wocky_loopback_stream_class)
 {
-  GObjectClass *obj_class = G_OBJECT_CLASS (wocky_loopback_connection_class);
+  GObjectClass *obj_class = G_OBJECT_CLASS (wocky_loopback_stream_class);
   GIOStreamClass *stream_class = G_IO_STREAM_CLASS (
-      wocky_loopback_connection_class);
+      wocky_loopback_stream_class);
 
-  g_type_class_add_private (wocky_loopback_connection_class,
-      sizeof (WockyLoopbackConnectionPrivate));
+  g_type_class_add_private (wocky_loopback_stream_class,
+      sizeof (WockyLoopbackStreamPrivate));
 
-  obj_class->dispose = wocky_loopback_connection_dispose;
-  obj_class->get_property = wocky_loopback_connection_get_property;
+  obj_class->dispose = wocky_loopback_stream_dispose;
+  obj_class->get_property = wocky_loopback_stream_get_property;
 
-  stream_class->get_input_stream = wocky_loopback_connection_get_input_stream;
-  stream_class->get_output_stream = wocky_loopback_connection_get_output_stream;
+  stream_class->get_input_stream = wocky_loopback_stream_get_input_stream;
+  stream_class->get_output_stream = wocky_loopback_stream_get_output_stream;
 
   g_object_class_install_property (obj_class, PROP_IO_INPUT_STREAM,
     g_param_spec_object ("input-stream", "Input stream",
@@ -197,9 +197,9 @@ wocky_loopback_connection_class_init (
 }
 
 GIOStream *
-wocky_loopback_connection_new (void)
+wocky_loopback_stream_new (void)
 {
-  return g_object_new (WOCKY_TYPE_LOOPBACK_CONNECTION, NULL);
+  return g_object_new (WOCKY_TYPE_LOOPBACK_STREAM, NULL);
 }
 
 /* Input stream */
diff --git a/wocky/wocky-loopback-stream.h b/wocky/wocky-loopback-stream.h
new file mode 100644
index 0000000..b31063e
--- /dev/null
+++ b/wocky/wocky-loopback-stream.h
@@ -0,0 +1,67 @@
+/*
+ * wocky-loopback-stream.h - Header for WockyLoopbackStream
+ * Copyright (C) 2009-2011 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __WOCKY_LOOPBACK_STREAM_H__
+#define __WOCKY_LOOPBACK_STREAM_H__
+
+#include <glib-object.h>
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+typedef struct _WockyLoopbackStream WockyLoopbackStream;
+typedef struct _WockyLoopbackStreamClass WockyLoopbackStreamClass;
+typedef struct _WockyLoopbackStreamPrivate WockyLoopbackStreamPrivate;
+
+struct _WockyLoopbackStreamClass
+{
+  GIOStreamClass parent_class;
+};
+
+struct _WockyLoopbackStream
+{
+  GIOStream parent;
+
+  WockyLoopbackStreamPrivate *priv;
+};
+
+GType wocky_loopback_stream_get_type (void);
+
+/* TYPE MACROS */
+#define WOCKY_TYPE_LOOPBACK_STREAM \
+  (wocky_loopback_stream_get_type ())
+#define WOCKY_LOOPBACK_STREAM(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), WOCKY_TYPE_LOOPBACK_STREAM, \
+      WockyLoopbackStream))
+#define WOCKY_LOOPBACK_STREAM_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), WOCKY_TYPE_LOOPBACK_STREAM, \
+      WockyLoopbackStreamClass))
+#define WOCKY_IS_LOOPBACK_STREAM(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), WOCKY_TYPE_LOOPBACK_STREAM))
+#define WOCKY_IS_LOOPBACK_STREAM_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), WOCKY_TYPE_LOOPBACK_STREAM))
+#define WOCKY_LOOPBACK_STREAM_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_LOOPBACK_STREAM, \
+      WockyLoopbackStreamClass))
+
+GIOStream * wocky_loopback_stream_new (void);
+
+G_END_DECLS
+
+#endif /* #ifndef __WOCKY_LOOPBACK_STREAM_H__*/
diff --git a/wocky/wocky-meta-porter.c b/wocky/wocky-meta-porter.c
index 85b3528..25992be 100644
--- a/wocky/wocky-meta-porter.c
+++ b/wocky/wocky-meta-porter.c
@@ -29,7 +29,7 @@
 #include "wocky-utils.h"
 #include "wocky-ll-contact.h"
 #include "wocky-ll-connector.h"
-#include "wocky-loopback-connection.h"
+#include "wocky-loopback-stream.h"
 
 #define DEBUG_FLAG DEBUG_PORTER
 #include "wocky-debug.h"
@@ -561,7 +561,7 @@ create_loopback_porter (WockyMetaPorter *self)
   if (priv->jid == NULL)
     return;
 
-  stream = wocky_loopback_connection_new ();
+  stream = wocky_loopback_stream_new ();
   connection = wocky_xmpp_connection_new (stream);
 
   /* really simple connector */