From d78e084fbfaaeafc4085284febbc0925cd4b25aa Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 8 May 2012 13:34:38 +0100 Subject: McdChannel: remove more unused accessors --- src/mcd-channel.c | 50 -------------------------------------------------- src/mcd-channel.h | 3 --- 2 files changed, 53 deletions(-) diff --git a/src/mcd-channel.c b/src/mcd-channel.c index 14374d17..29ebd860 100644 --- a/src/mcd-channel.c +++ b/src/mcd-channel.c @@ -748,12 +748,6 @@ mcd_channel_get_status (McdChannel *channel) return MCD_CHANNEL_PRIV (channel)->status; } -const gchar * -mcd_channel_get_channel_type (McdChannel *channel) -{ - return g_quark_to_string (mcd_channel_get_channel_type_quark (channel)); -} - GQuark mcd_channel_get_channel_type_quark (McdChannel *channel) { @@ -784,50 +778,6 @@ mcd_channel_get_object_path (McdChannel *channel) return priv->tp_chan ? TP_PROXY (priv->tp_chan)->object_path : NULL; } -guint -mcd_channel_get_handle (McdChannel *channel) -{ - McdChannelPrivate *priv; - - g_return_val_if_fail (MCD_IS_CHANNEL (channel), 0); - priv = channel->priv; - if (priv->tp_chan) - return tp_channel_get_handle (priv->tp_chan, NULL); - - if (G_LIKELY (priv->request != NULL)) - { - GHashTable *properties = _mcd_request_get_properties (priv->request); - - return tp_asv_get_uint32 (properties, - TP_IFACE_CHANNEL ".TargetHandle", NULL); - } - - return 0; -} - -TpHandleType -mcd_channel_get_handle_type (McdChannel *channel) -{ - McdChannelPrivate *priv; - guint handle_type = TP_HANDLE_TYPE_NONE; - - g_return_val_if_fail (MCD_IS_CHANNEL (channel), 0); - priv = channel->priv; - if (priv->tp_chan) - { - tp_channel_get_handle (priv->tp_chan, &handle_type); - } - else if (G_LIKELY (priv->request != NULL)) - { - GHashTable *properties = _mcd_request_get_properties (priv->request); - - handle_type = tp_asv_get_uint32 (properties, - TP_IFACE_CHANNEL ".TargetHandle", NULL); - } - - return handle_type; -} - /* * _mcd_channel_get_immutable_properties: * @channel: the #McdChannel. diff --git a/src/mcd-channel.h b/src/mcd-channel.h index 163ee9ec..2ce92781 100644 --- a/src/mcd-channel.h +++ b/src/mcd-channel.h @@ -101,11 +101,8 @@ McdChannel *mcd_channel_new_from_path (TpConnection *connection, TpHandleType handle_type); McdChannelStatus mcd_channel_get_status (McdChannel * channel); -const gchar* mcd_channel_get_channel_type (McdChannel *channel); GQuark mcd_channel_get_channel_type_quark (McdChannel *channel); const gchar* mcd_channel_get_object_path (McdChannel *channel); -guint mcd_channel_get_handle (McdChannel *channel); -TpHandleType mcd_channel_get_handle_type (McdChannel *channel); gboolean mcd_channel_is_requested (McdChannel *channel); McdAccount *mcd_channel_get_account (McdChannel *channel); TpChannel *mcd_channel_get_tp_channel (McdChannel *channel); -- cgit v1.2.3