--- a/loudmouth/Makefile.am Fri Nov 21 21:51:43 2008 +0100
+++ b/loudmouth/Makefile.am Sun Nov 23 23:32:15 2008 +0100
@@ -76,12 +76,10 @@
lm-sock.c \
lm-old-socket.c \
lm-old-socket.h \
- \
+ \
lm-socket.c \
lm-socket.h \
- lm-tcp-socket.c \
- lm-tcp-socket.h \
- \
+ \
lm-feature-ping.c \
lm-feature-ping.h \
\
--- a/loudmouth/lm-tcp-socket.c Fri Nov 21 21:51:43 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Copyright (C) 2008 Imendio AB
- *
- * This program 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 of the
- * License, or (at your option) any later version.
- *
- * This program 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "lm-marshal.h"
-#include "lm-tcp-socket.h"
-#include "lm-socket.h"
-
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), LM_TYPE_TCP_SOCKET, LmTcpSocketPriv))
-
-typedef struct LmTcpSocketPriv LmTcpSocketPriv;
-struct LmTcpSocketPriv {
- gint my_prop;
-};
-
-static void tcp_socket_iface_init (LmSocketIface *iface);
-static void tcp_socket_finalize (GObject *object);
-static void tcp_socket_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec);
-static void tcp_socket_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec);
-static void tcp_socket_connect (LmSocket *socket);
-static gboolean tcp_socket_write (LmSocket *socket,
- gchar *data,
- gsize len);
-static gboolean tcp_socket_read (LmSocket *socket,
- gchar *buf,
- gsize buf_len,
- gsize *read_len);
-static void tcp_socket_disconnect (LmSocket *socket);
-
-G_DEFINE_TYPE_WITH_CODE (LmTcpSocket, lm_tcp_socket, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (LM_TYPE_SOCKET,
- tcp_socket_iface_init))
-
-enum {
- PROP_0,
- PROP_MY_PROP
-};
-
-enum {
- SIGNAL_NAME,
- LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static void
-lm_tcp_socket_class_init (LmTcpSocketClass *class)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (class);
-
- object_class->finalize = tcp_socket_finalize;
- object_class->get_property = tcp_socket_get_property;
- object_class->set_property = tcp_socket_set_property;
-
- g_object_class_install_property (object_class,
- PROP_MY_PROP,
- g_param_spec_string ("my-prop",
- "My Prop",
- "My Property",
- NULL,
- G_PARAM_READWRITE));
-
- signals[SIGNAL_NAME] =
- g_signal_new ("signal-name",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- _lm_marshal_VOID__INT,
- G_TYPE_NONE,
- 1, G_TYPE_INT);
-
- g_type_class_add_private (object_class, sizeof (LmTcpSocketPriv));
-}
-
-static void
-tcp_socket_iface_init (LmSocketIface *iface)
-{
- iface->connect = tcp_socket_connect;
- iface->write = tcp_socket_write;
- iface->read = tcp_socket_read;
- iface->disconnect = tcp_socket_disconnect;
-}
-
-static void
-lm_tcp_socket_init (LmTcpSocket *dummy)
-{
- LmTcpSocketPriv *priv;
-
- priv = GET_PRIV (dummy);
-
-}
-
-static void
-tcp_socket_finalize (GObject *object)
-{
- LmTcpSocketPriv *priv;
-
- priv = GET_PRIV (object);
-
- (G_OBJECT_CLASS (lm_tcp_socket_parent_class)->finalize) (object);
-}
-
-static void
-tcp_socket_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec)
-{
- LmTcpSocketPriv *priv;
-
- priv = GET_PRIV (object);
-
- switch (param_id) {
- case PROP_MY_PROP:
- g_value_set_int (value, priv->my_prop);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
- break;
- };
-}
-
-static void
-tcp_socket_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- LmTcpSocketPriv *priv;
-
- priv = GET_PRIV (object);
-
- switch (param_id) {
- case PROP_MY_PROP:
- priv->my_prop = g_value_get_int (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
- break;
- };
-}
-
-static void
-tcp_socket_connect (LmSocket *socket)
-{
- /* Initiate the connection process */
- /* DNS lookup, connect thing, create IOchannel etc */
-}
-
-static gboolean
-tcp_socket_write (LmSocket *socket, gchar *data, gsize len)
-{
- return FALSE;
-}
-
-static gboolean
-tcp_socket_read (LmSocket *socket,
- gchar *buf,
- gsize buf_len,
- gsize *read_len)
-{
- return FALSE;
-}
-
-static void
-tcp_socket_disconnect (LmSocket *socket)
-{
-}
-
-
--- a/loudmouth/lm-tcp-socket.h Fri Nov 21 21:51:43 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Copyright (C) 2008 Imendio AB
- *
- * This program 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 of the
- * License, or (at your option) any later version.
- *
- * This program 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 program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __LM_TCP_SOCKET_H__
-#define __LM_TCP_SOCKET_H__
-
-#include <glib-object.h>
-
-#include "lm-socket.h"
-
-G_BEGIN_DECLS
-
-#define LM_TYPE_TCP_SOCKET (lm_tcp_socket_get_type ())
-#define LM_TCP_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LM_TYPE_TCP_SOCKET, LmTcpSocket))
-#define LM_TCP_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LM_TYPE_TCP_SOCKET, LmTcpSocketClass))
-#define LM_IS_TCP_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LM_TYPE_TCP_SOCKET))
-#define LM_IS_TCP_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LM_TYPE_TCP_SOCKET))
-#define LM_TCP_SOCKET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LM_TYPE_TCP_SOCKET, LmTcpSocketClass))
-
-typedef struct LmTcpSocket LmTcpSocket;
-typedef struct LmTcpSocketClass LmTcpSocketClass;
-
-struct LmTcpSocket {
- GObject parent;
-};
-
-struct LmTcpSocketClass {
- GObjectClass parent_class;
-};
-
-GType lm_tcp_socket_get_type (void);
-
-G_END_DECLS
-
-#endif /* __LM_TCP_SOCKET_H__ */
-