gibber-xmpp-reader: removed

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

5 files changed, 0 insertions, 385 deletions

diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am
index 5206df16..0603f6e9 100644
--- a/lib/gibber/Makefile.am
+++ b/lib/gibber/Makefile.am
@@ -24,8 +24,6 @@ HANDWRITTEN_SOURCES =             \
   gibber-bytestream-direct.c      \
   gibber-debug.c                  \
   gibber-debug.h                  \
-  gibber-xmpp-reader.c            \
-  gibber-xmpp-reader.h            \
   gibber-xmpp-writer.c            \
   gibber-xmpp-writer.h            \
   gibber-transport.c              \
diff --git a/lib/gibber/gibber-xmpp-reader.c b/lib/gibber/gibber-xmpp-reader.c
deleted file mode 100644
index 7b265136..00000000
--- a/lib/gibber/gibber-xmpp-reader.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * gibber-xmpp-reader.c - Source for GibberXmppReader
- * Copyright (C) 2006 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd@luon.net>
- *
- * 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
- */
-
-#include "gibber-xmpp-reader.h"
-
-#include "gibber-signals-marshal.h"
-
-#include <wocky/wocky-stanza.h>
-
-#define XMPP_STREAM_NAMESPACE "http://etherx.jabber.org/streams"
-
-#define DEBUG_FLAG DEBUG_XMPP_READER
-#include "gibber-debug.h"
-
-G_DEFINE_TYPE (GibberXmppReader, gibber_xmpp_reader, WOCKY_TYPE_XMPP_READER)
-
-/* signal enum */
-enum {
-  RECEIVED_STANZA,
-  STREAM_OPENED,
-  STREAM_CLOSED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
-/* private structure */
-typedef struct _GibberXmppReaderPrivate GibberXmppReaderPrivate;
-
-struct _GibberXmppReaderPrivate
-{
-  gboolean emitted_opened;
-  gboolean emitted_closed;
-};
-
-#define GIBBER_XMPP_READER_GET_PRIVATE(o)  \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), GIBBER_TYPE_XMPP_READER, \
-   GibberXmppReaderPrivate))
-
-static void
-gibber_xmpp_reader_init (GibberXmppReader *obj)
-{
-  GibberXmppReaderPrivate *priv = GIBBER_XMPP_READER_GET_PRIVATE (obj);
-
-  priv->emitted_opened = FALSE;
-  priv->emitted_closed = FALSE;
-}
-
-static void
-gibber_xmpp_reader_class_init (GibberXmppReaderClass *gibber_xmpp_reader_class)
-{
-  g_type_class_add_private (gibber_xmpp_reader_class,
-      sizeof (GibberXmppReaderPrivate));
-
-  signals[RECEIVED_STANZA] = g_signal_new ("received-stanza",
-      G_OBJECT_CLASS_TYPE(gibber_xmpp_reader_class),
-      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-      0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
-      G_TYPE_NONE, 1, WOCKY_TYPE_STANZA);
-
-  signals[STREAM_OPENED] = g_signal_new ("stream-opened",
-      G_OBJECT_CLASS_TYPE(gibber_xmpp_reader_class),
-      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-      0,
-      NULL, NULL,
-      _gibber_signals_marshal_VOID__STRING_STRING_STRING,
-      G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-
-  signals[STREAM_CLOSED] = g_signal_new ("stream-closed",
-      G_OBJECT_CLASS_TYPE(gibber_xmpp_reader_class),
-      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-      0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
-      G_TYPE_NONE, 0);
-}
-
-GibberXmppReader *
-gibber_xmpp_reader_new (void)
-{
-  return g_object_new (GIBBER_TYPE_XMPP_READER,
-      NULL);
-}
-
-GibberXmppReader *
-gibber_xmpp_reader_new_no_stream (void)
-{
-  return g_object_new (GIBBER_TYPE_XMPP_READER,
-      "streaming-mode", FALSE,
-      NULL);
-}
-
-gboolean
-gibber_xmpp_reader_push (GibberXmppReader *reader, const guint8 *data,
-    gsize length, GError **error)
-{
-  WockyXmppReader *wocky = WOCKY_XMPP_READER (reader);
-  GibberXmppReaderPrivate *priv = GIBBER_XMPP_READER_GET_PRIVATE (reader);
-  WockyStanza *stanza;
-  GError *e = NULL;
-  gboolean streaming_mode;
-
-  g_return_val_if_fail (wocky_xmpp_reader_get_state (wocky) !=
-      WOCKY_XMPP_READER_STATE_ERROR, FALSE);
-
-  g_object_get (wocky,
-      "streaming-mode", &streaming_mode,
-      NULL);
-
-  wocky_xmpp_reader_push (wocky, data, length);
-
-  if (wocky_xmpp_reader_get_state (wocky) == WOCKY_XMPP_READER_STATE_OPENED
-      && !priv->emitted_opened)
-    {
-      gchar *from = NULL, *to = NULL, *version = NULL;
-
-      g_object_get (wocky,
-          "from", &from,
-          "to", &to,
-          "version", &version,
-          NULL);
-
-      priv->emitted_opened = TRUE;
-      g_signal_emit (reader, signals[STREAM_OPENED], 0, to, from, version);
-      g_free (to);
-      g_free (from);
-      g_free (version);
-    }
-
-  for (stanza = wocky_xmpp_reader_pop_stanza (wocky);
-      stanza != NULL;
-      stanza = wocky_xmpp_reader_pop_stanza (wocky))
-    {
-      g_signal_emit (reader, signals[RECEIVED_STANZA], 0, stanza);
-      g_object_unref (stanza);
-    }
-
-  if (wocky_xmpp_reader_get_state (wocky) == WOCKY_XMPP_READER_STATE_CLOSED
-      && !priv->emitted_closed)
-    {
-      priv->emitted_closed = TRUE;
-      g_signal_emit (reader, signals[STREAM_CLOSED], 0);
-    }
-
-  if (!streaming_mode)
-    {
-      wocky_xmpp_reader_reset (wocky);
-    }
-
-  e = wocky_xmpp_reader_get_error (wocky);
-
-  if (e == NULL)
-    {
-      return TRUE;
-    }
-  else
-    {
-      g_propagate_error (error, e);
-      return FALSE;
-    }
-}
-
-void
-gibber_xmpp_reader_reset (GibberXmppReader *reader)
-{
-  wocky_xmpp_reader_reset (WOCKY_XMPP_READER (reader));
-}
-
diff --git a/lib/gibber/gibber-xmpp-reader.h b/lib/gibber/gibber-xmpp-reader.h
deleted file mode 100644
index fc6a91d4..00000000
--- a/lib/gibber/gibber-xmpp-reader.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * gibber-xmpp-reader.h - Header for GibberXmppReader
- * Copyright (C) 2006 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd@luon.net>
- *
- * 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 __GIBBER_XMPP_READER_H__
-#define __GIBBER_XMPP_READER_H__
-
-#include <glib-object.h>
-#include <wocky/wocky-xmpp-reader.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GibberXmppReader GibberXmppReader;
-typedef struct _GibberXmppReaderClass GibberXmppReaderClass;
-
-struct _GibberXmppReaderClass {
-    WockyXmppReaderClass parent_class;
-};
-
-struct _GibberXmppReader {
-    WockyXmppReader parent;
-};
-
-GType gibber_xmpp_reader_get_type (void);
-
-/* TYPE MACROS */
-#define GIBBER_TYPE_XMPP_READER \
-  (gibber_xmpp_reader_get_type ())
-#define GIBBER_XMPP_READER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GIBBER_TYPE_XMPP_READER, \
-   GibberXmppReader))
-#define GIBBER_XMPP_READER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GIBBER_TYPE_XMPP_READER,  \
-   GibberXmppReaderClass))
-#define GIBBER_IS_XMPP_READER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GIBBER_TYPE_XMPP_READER))
-#define GIBBER_IS_XMPP_READER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GIBBER_TYPE_XMPP_READER))
-#define GIBBER_XMPP_READER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIBBER_TYPE_XMPP_READER, \
-   GibberXmppReaderClass))
-
-GibberXmppReader * gibber_xmpp_reader_new (void);
-GibberXmppReader * gibber_xmpp_reader_new_no_stream (void);
-void gibber_xmpp_reader_reset (GibberXmppReader *reader);
-
-gboolean gibber_xmpp_reader_push (GibberXmppReader *reader,
-    const guint8 *data, gsize length, GError **error);
-
-G_END_DECLS
-
-#endif /* #ifndef __GIBBER_XMPP_READER_H__*/
diff --git a/lib/gibber/tests/Makefile.am b/lib/gibber/tests/Makefile.am
index 03e3f6eb..36c49712 100644
--- a/lib/gibber/tests/Makefile.am
+++ b/lib/gibber/tests/Makefile.am
@@ -61,7 +61,6 @@ test_r_multicast_transport_io_CFLAGS = \
 # Checks
 
 check_PROGRAMS = \
-	check-gibber-xmpp-reader \
 	check-gibber-r-multicast-causal-transport \
 	check-gibber-r-multicast-packet \
 	check-gibber-r-multicast-sender \
diff --git a/lib/gibber/tests/check-gibber-xmpp-reader.c b/lib/gibber/tests/check-gibber-xmpp-reader.c
deleted file mode 100644
index 42bf9930..00000000
--- a/lib/gibber/tests/check-gibber-xmpp-reader.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <gibber/gibber-xmpp-reader.h>
-#include <wocky/wocky-stanza.h>
-
-typedef struct _ReceivedStanzaEvent ReceivedStanzaEvent;
-
-struct _ReceivedStanzaEvent {
-  GibberXmppReader *reader;
-  WockyStanza *stanza;
-};
-
-static void received_stanza_cb (GibberXmppReader *reader,
-    WockyStanza *stanza, gpointer user_data)
-{
-  GQueue *events_queue = (GQueue *) user_data;
-  ReceivedStanzaEvent *event;
-
-  g_assert (reader != NULL);
-  g_assert (stanza != NULL);
-  g_assert (events_queue != NULL);
-
-  g_object_ref (stanza);
-
-  event = g_new (ReceivedStanzaEvent, 1);
-  event->reader = reader;
-  event->stanza = stanza;
-
-  g_queue_push_tail (events_queue, event);
-}
-
-
-static void
-test_instantiation (void)
-{
-  GibberXmppReader *reader;
-  reader = gibber_xmpp_reader_new_no_stream ();
-  g_assert (reader != NULL);
-  g_object_unref (reader);
-}
-
-static void
-test_simple_message (void)
-{
-  GibberXmppReader *reader;
-  WockyNode *node;
-  gchar *data;
-  gsize length;
-  gboolean valid;
-  GQueue *received_stanzas;
-  ReceivedStanzaEvent *event;
-  const gchar *srcdir;
-  gchar *file;
-
-  received_stanzas = g_queue_new ();
-
-  reader = gibber_xmpp_reader_new ();
-  g_signal_connect (reader, "received-stanza",
-      G_CALLBACK (received_stanza_cb), received_stanzas);
-
-  srcdir = g_getenv ("srcdir");
-  if (srcdir == NULL)
-    {
-      file = g_strdup ("inputs/simple-message.input");
-    }
-  else
-    {
-      file = g_strdup_printf ("%s/inputs/simple-message.input", srcdir);
-    }
-
-  g_assert (g_file_get_contents (file, &data, &length, NULL));
-  g_free (file);
-
-  valid = gibber_xmpp_reader_push (reader, (guint8 *) data, length, NULL);
-  g_assert (valid);
-
-  g_assert (g_queue_get_length (received_stanzas) == 2);
-
-  event = g_queue_pop_head (received_stanzas);
-
-  g_assert (event->reader == reader);
-
-  node = wocky_stanza_get_top_node (event->stanza);
-  g_assert (node != NULL);
-  g_assert_cmpstr (node->name, ==, "message");
-  g_assert_cmpstr (wocky_node_get_language (node), ==, "en");
-  g_assert_cmpstr (wocky_node_get_attribute (node, "to"), ==,
-      "juliet@example.com");
-  g_assert_cmpstr (wocky_node_get_attribute (node, "id"), ==, "0");
-
-  g_object_unref (event->stanza);
-  g_free (event);
-
-  event = g_queue_pop_head (received_stanzas);
-
-  g_assert (event->reader == reader);
-
-  node = wocky_stanza_get_top_node (event->stanza);
-  g_assert_cmpstr (node->name, ==, "message");
-  g_assert_cmpstr (wocky_node_get_language (node), ==, "en");
-  g_assert_cmpstr (wocky_node_get_attribute (node, "to"), ==,
-      "juliet@example.com");
-  g_assert_cmpstr (wocky_node_get_attribute (node, "id"), ==, "1");
-
-  g_free (data);
-  g_queue_free (received_stanzas);
-  g_object_unref (event->stanza);
-  g_free (event);
-  g_object_unref (reader);
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  g_test_init (&argc, &argv, NULL);
-  g_type_init ();
-
-  g_test_add_func ("/gibber/xmpp-reader/instantiation",
-      test_instantiation);
-  g_test_add_func ("/gibber/xmpp-reader/simple-message",
-      test_simple_message);
-
-  return g_test_run ();
-}