[next] telepathy-mission-control: remove functions dealing with channel details
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Wed Jan 29 08:12:40 PST 2014
Module: telepathy-mission-control
Branch: next
Commit: 269203b936382006cbbd95536a2b7839079ad820
URL: http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=269203b936382006cbbd95536a2b7839079ad820
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Fri Jan 24 11:01:15 2014 +0100
remove functions dealing with channel details
They are no longer used.
---
src/channel-utils.c | 72 ---------------------------------------------------
src/channel-utils.h | 7 -----
2 files changed, 79 deletions(-)
diff --git a/src/channel-utils.c b/src/channel-utils.c
index 5bd0cd8..5ff66e4 100644
--- a/src/channel-utils.c
+++ b/src/channel-utils.c
@@ -65,78 +65,6 @@ _mcd_tp_channel_should_close (TpChannel *channel,
return TRUE;
}
-static void
-_channel_details_array_append (GPtrArray *channel_array, TpChannel *channel)
-{
- GType type = TP_STRUCT_TYPE_CHANNEL_DETAILS;
- GValue channel_val = G_VALUE_INIT;
- GVariant *pair[2];
- GVariant *tuple;
-
- pair[0] = g_variant_new_object_path (tp_proxy_get_object_path (channel));
- pair[1] = tp_channel_dup_immutable_properties (channel);
- /* takes ownership of floating pair[0] */
- tuple = g_variant_new_tuple (pair, 2);
- dbus_g_value_parse_g_variant (tuple, &channel_val);
- g_variant_unref (pair[1]);
- g_variant_unref (tuple);
- g_assert (G_VALUE_HOLDS (&channel_val, type));
-
- g_ptr_array_add (channel_array, g_value_get_boxed (&channel_val));
-}
-
-/*
- * _mcd_tp_channel_details_build_from_list:
- * @channels: a #GList of #McdChannel elements.
- *
- * Returns: a #GPtrArray of Channel_Details, ready to be sent over D-Bus. Free
- * with _mcd_tp_channel_details_free().
- */
-GPtrArray *
-_mcd_tp_channel_details_build_from_list (const GList *channels)
-{
- GPtrArray *channel_array;
- const GList *list;
-
- channel_array = g_ptr_array_sized_new (g_list_length ((GList *) channels));
-
- for (list = channels; list != NULL; list = list->next)
- {
- _channel_details_array_append (channel_array,
- mcd_channel_get_tp_channel (MCD_CHANNEL (list->data)));
- }
-
- return channel_array;
-}
-
-/*
- * _mcd_tp_channel_details_build_from_tp_chan:
- * @channel: a #TpChannel
- *
- * Returns: a #GPtrArray of Channel_Details, ready to be sent over D-Bus. Free
- * with _mcd_tp_channel_details_free().
- */
-GPtrArray *
-_mcd_tp_channel_details_build_from_tp_chan (TpChannel *channel)
-{
- GPtrArray *channel_array = g_ptr_array_sized_new (1);
-
- _channel_details_array_append (channel_array, channel);
- return channel_array;
-}
-
-/*
- * _mcd_tp_channel_details_free:
- * @channels: a #GPtrArray of Channel_Details.
- *
- * Frees the memory used by @channels.
- */
-void
-_mcd_tp_channel_details_free (GPtrArray *channels)
-{
- g_boxed_free (TP_ARRAY_TYPE_CHANNEL_DETAILS_LIST, channels);
-}
-
GHashTable *
_mcd_tp_channel_dup_immutable_properties_asv (TpChannel *channel)
{
diff --git a/src/channel-utils.h b/src/channel-utils.h
index 5b8c24c..e89ebdc 100644
--- a/src/channel-utils.h
+++ b/src/channel-utils.h
@@ -33,13 +33,6 @@
G_BEGIN_DECLS
-G_GNUC_INTERNAL
-GPtrArray *_mcd_tp_channel_details_build_from_list (const GList *channels);
-G_GNUC_INTERNAL
-GPtrArray *_mcd_tp_channel_details_build_from_tp_chan (TpChannel *channel);
-G_GNUC_INTERNAL
-void _mcd_tp_channel_details_free (GPtrArray *channels);
-
/* NULL-safe for @channel; @verb is for debug */
G_GNUC_INTERNAL gboolean _mcd_tp_channel_should_close (TpChannel *channel,
const gchar *verb);
More information about the telepathy-commits
mailing list