[Telepathy-commits] [telepathy-gabble/master] Tubes: use telepathy-glib GTypes
Simon McVittie
simon.mcvittie at collabora.co.uk
Tue Aug 19 10:53:35 PDT 2008
20080722170653-53eee-dbd53c8e3d0be80713f0d396eb40e39f90903fbd.gz
---
src/tube-stream.c | 25 +++++++++++--------------
src/tubes-channel.c | 33 ++++++++++-----------------------
2 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/src/tube-stream.c b/src/tube-stream.c
index bce7331..4d60b8d 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -31,6 +31,7 @@
#include <glib/gstdio.h>
#include <loudmouth/loudmouth.h>
+#include <telepathy-glib/gtypes.h>
#define DEBUG_FLAG GABBLE_DEBUG_TUBES
@@ -52,14 +53,6 @@ tube_iface_init (gpointer g_iface, gpointer iface_data);
G_DEFINE_TYPE_WITH_CODE (GabbleTubeStream, gabble_tube_stream, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (GABBLE_TYPE_TUBE_IFACE, tube_iface_init));
-#define SOCKET_ADDRESS_IPV4_TYPE \
- dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, \
- G_TYPE_INVALID)
-
-#define SOCKET_ADDRESS_IPV6_TYPE \
- dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, \
- G_TYPE_INVALID)
-
/* Linux glibc bits/socket.h suggests that struct sockaddr_storage is
* not guaranteed to be big enough for AF_UNIX addresses */
typedef union
@@ -685,9 +678,11 @@ tube_stream_open (GabbleTubeStream *self,
DEBUG ("create socket %s:%u", "127.0.0.1", ntohs (addr.sin_port));
- priv->address = tp_g_value_slice_new (SOCKET_ADDRESS_IPV4_TYPE);
+ priv->address = tp_g_value_slice_new (
+ TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4);
g_value_take_boxed (priv->address,
- dbus_g_type_specialized_construct (SOCKET_ADDRESS_IPV4_TYPE));
+ dbus_g_type_specialized_construct (
+ TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4));
dbus_g_type_struct_set (priv->address,
0, "127.0.0.1",
@@ -733,9 +728,11 @@ tube_stream_open (GabbleTubeStream *self,
DEBUG ("create socket %s:%u", "::1", ntohs (addr.sin6_port));
- priv->address = tp_g_value_slice_new (SOCKET_ADDRESS_IPV6_TYPE);
+ priv->address = tp_g_value_slice_new (
+ TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV6);
g_value_take_boxed (priv->address,
- dbus_g_type_specialized_construct (SOCKET_ADDRESS_IPV6_TYPE));
+ dbus_g_type_specialized_construct (
+ TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV6));
dbus_g_type_struct_set (priv->address,
0, "::1",
@@ -1513,7 +1510,7 @@ check_ip_params (TpSocketAddressType address_type,
/* Check address type */
if (address_type == TP_SOCKET_ADDRESS_TYPE_IPV4)
{
- if (G_VALUE_TYPE (address) != SOCKET_ADDRESS_IPV4_TYPE)
+ if (G_VALUE_TYPE (address) != TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4)
{
g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
"IPv4 socket address is supposed to be sq");
@@ -1522,7 +1519,7 @@ check_ip_params (TpSocketAddressType address_type,
}
else if (address_type == TP_SOCKET_ADDRESS_TYPE_IPV6)
{
- if (G_VALUE_TYPE (address) != SOCKET_ADDRESS_IPV6_TYPE)
+ if (G_VALUE_TYPE (address) != TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV6)
{
g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
"IPv6 socket address is supposed to be sq");
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index e412b55..dfc6645 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -34,6 +34,7 @@
#include <telepathy-glib/enums.h>
#include <telepathy-glib/errors.h>
#include <telepathy-glib/group-mixin.h>
+#include <telepathy-glib/gtypes.h>
#include <telepathy-glib/interfaces.h>
#include <telepathy-glib/svc-channel.h>
#include <telepathy-glib/svc-generic.h>
@@ -54,20 +55,6 @@
#include "tube-dbus.h"
#endif
-#define GABBLE_CHANNEL_TUBE_TYPE \
- (dbus_g_type_get_struct ("GValueArray", \
- G_TYPE_UINT, \
- G_TYPE_UINT, \
- G_TYPE_UINT, \
- G_TYPE_STRING, \
- dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), \
- G_TYPE_UINT, \
- G_TYPE_INVALID))
-
-#define DBUS_NAME_PAIR_TYPE \
- (dbus_g_type_get_struct ("GValueArray", \
- G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID))
-
static void channel_iface_init (gpointer, gpointer);
static void tubes_iface_init (gpointer, gpointer);
@@ -287,9 +274,9 @@ d_bus_names_changed_added (GabbleTubesChannel *self,
GValue tmp = {0,};
guint i;
- g_value_init (&tmp, DBUS_NAME_PAIR_TYPE);
+ g_value_init (&tmp, TP_STRUCT_TYPE_DBUS_TUBE_MEMBER);
g_value_take_boxed (&tmp,
- dbus_g_type_specialized_construct (DBUS_NAME_PAIR_TYPE));
+ dbus_g_type_specialized_construct (TP_STRUCT_TYPE_DBUS_TUBE_MEMBER));
dbus_g_type_struct_set (&tmp,
0, contact,
1, new_name,
@@ -300,7 +287,7 @@ d_bus_names_changed_added (GabbleTubesChannel *self,
tube_id, added, removed);
for (i = 0; i < added->len; i++)
- g_boxed_free (DBUS_NAME_PAIR_TYPE, added->pdata[i]);
+ g_boxed_free (TP_STRUCT_TYPE_DBUS_TUBE_MEMBER, added->pdata[i]);
g_ptr_array_free (added, TRUE);
g_array_free (removed, TRUE);
}
@@ -858,9 +845,9 @@ copy_tube_in_ptr_array (gpointer key,
"state", &state,
NULL);
- g_value_init (&entry, GABBLE_CHANNEL_TUBE_TYPE);
+ g_value_init (&entry, TP_STRUCT_TYPE_TUBE_INFO);
g_value_take_boxed (&entry,
- dbus_g_type_specialized_construct (GABBLE_CHANNEL_TUBE_TYPE));
+ dbus_g_type_specialized_construct (TP_STRUCT_TYPE_TUBE_INFO));
dbus_g_type_struct_set (&entry,
0, tube_id,
1, initiator,
@@ -941,7 +928,7 @@ gabble_tubes_channel_list_tubes (TpSvcChannelTypeTubes *iface,
tp_svc_channel_type_tubes_return_from_list_tubes (context, ret);
for (i = 0; i < ret->len; i++)
- g_boxed_free (GABBLE_CHANNEL_TUBE_TYPE, ret->pdata[i]);
+ g_boxed_free (TP_STRUCT_TYPE_TUBE_INFO, ret->pdata[i]);
g_ptr_array_free (ret, TRUE);
}
@@ -2076,9 +2063,9 @@ get_d_bus_names_foreach (gpointer key,
GPtrArray *ret = user_data;
GValue tmp = {0,};
- g_value_init (&tmp, DBUS_NAME_PAIR_TYPE);
+ g_value_init (&tmp, TP_STRUCT_TYPE_DBUS_TUBE_MEMBER);
g_value_take_boxed (&tmp,
- dbus_g_type_specialized_construct (DBUS_NAME_PAIR_TYPE));
+ dbus_g_type_specialized_construct (TP_STRUCT_TYPE_DBUS_TUBE_MEMBER));
dbus_g_type_struct_set (&tmp,
0, key,
1, value,
@@ -2153,7 +2140,7 @@ gabble_tubes_channel_get_d_bus_names (TpSvcChannelTypeTubes *iface,
tp_svc_channel_type_tubes_return_from_get_d_bus_names (context, ret);
for (i = 0; i < ret->len; i++)
- g_boxed_free (DBUS_NAME_PAIR_TYPE, ret->pdata[i]);
+ g_boxed_free (TP_STRUCT_TYPE_DBUS_TUBE_MEMBER, ret->pdata[i]);
g_hash_table_unref (names);
g_ptr_array_free (ret, TRUE);
--
1.5.6.3
More information about the Telepathy-commits
mailing list