[telepathy-mission-control/master] McdChannel: remove some cruft previously needed for pre-Requests support

[Simon McVittie]

---
 src/mcd-channel-priv.h |    8 ------
 src/mcd-channel.c      |   65 +----------------------------------------------
 src/mcd-channel.h      |    1 -
 3 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/src/mcd-channel-priv.h b/src/mcd-channel-priv.h
index 5c01207..574903b 100644
--- a/src/mcd-channel-priv.h
+++ b/src/mcd-channel-priv.h
@@ -31,8 +31,6 @@
 
 G_BEGIN_DECLS
 
-G_GNUC_INTERNAL McdChannel *_mcd_channel_new_undispatched (void);
-
 G_GNUC_INTERNAL
 gboolean _mcd_channel_create_proxy (McdChannel *channel,
                                     TpConnection *connection,
@@ -46,12 +44,6 @@ void _mcd_channel_set_status (McdChannel *channel, McdChannelStatus status);
 G_GNUC_INTERNAL void _mcd_channel_undispatchable (McdChannel *self);
 
 G_GNUC_INTERNAL
-gboolean _mcd_channel_create_proxy_old (McdChannel *channel,
-                                        TpConnection *connection,
-                                        const gchar *object_path,
-                                        const gchar *type, guint handle,
-                                        TpHandleType handle_type);
-G_GNUC_INTERNAL
 GHashTable *_mcd_channel_get_immutable_properties (McdChannel *channel);
 
 G_GNUC_INTERNAL
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index bcf5183..c45d166 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -88,7 +88,6 @@ struct _McdChannelRequestData
     gchar *path;
 
     GHashTable *properties;
-    guint target_handle; /* used only if the Requests interface is absent */
     gint64 user_time;
     gchar *preferred_handler;
     McdAccount *account;  /* weak ref */
@@ -768,46 +767,6 @@ mcd_channel_new_from_path (TpConnection *connection, const gchar *object_path,
     return channel;
 }
 
-McdChannel *
-_mcd_channel_new_undispatched (void)
-{
-    return g_object_new (MCD_TYPE_CHANNEL,
-                         "outgoing", FALSE,
-                         NULL);
-}
-
-gboolean
-_mcd_channel_create_proxy_old (McdChannel *channel, TpConnection *connection,
-                               const gchar *object_path, const gchar *type,
-                               guint handle, TpHandleType handle_type)
-{
-    GHashTable *props;
-    GValue v_type = { 0 };
-    GValue v_handle = { 0 };
-    GValue v_handle_type = { 0 };
-    gboolean ret;
-
-    props = g_hash_table_new (g_str_hash, g_str_equal);
-
-    g_value_init (&v_type, G_TYPE_STRING);
-    g_value_set_static_string (&v_type, type);
-    g_hash_table_insert (props, TP_IFACE_CHANNEL ".ChannelType", &v_type);
-
-    g_value_init (&v_handle, G_TYPE_UINT);
-    g_value_set_uint (&v_handle, handle);
-    g_hash_table_insert (props, TP_IFACE_CHANNEL ".TargetHandle", &v_handle);
-
-    g_value_init (&v_handle_type, G_TYPE_UINT);
-    g_value_set_uint (&v_handle_type, handle_type);
-    g_hash_table_insert (props, TP_IFACE_CHANNEL ".TargetHandleType",
-                         &v_handle_type);
-
-    ret = _mcd_channel_create_proxy (channel, connection, object_path, props);
-
-    g_hash_table_unref (props);
-    return ret;
-}
-
 /**
  * mcd_channel_create_proxy:
  * @channel: the #McdChannel.
@@ -919,25 +878,6 @@ mcd_channel_get_object_path (McdChannel *channel)
     return priv->tp_chan ? TP_PROXY (priv->tp_chan)->object_path : NULL;
 }
 
-void
-mcd_channel_set_handle (McdChannel *channel, guint handle)
-{
-    McdChannelPrivate *priv;
-
-    g_return_if_fail (MCD_IS_CHANNEL (channel));
-    priv = channel->priv;
-    g_return_if_fail (priv->status != MCD_CHANNEL_STATUS_REQUEST);
-
-    /* we cannot add the handle to the request_data->properties hash table,
-     * because we don't know how the table elements should be allocated. So,
-     * use a separate field in the request_data structure.
-     * In any case, this function is called only if the new Requests interface
-     * is not available on the connection, meaning that we won't directly use
-     * the hash table anyway.
-     */
-    priv->request_data->target_handle = handle;
-}
-
 guint
 mcd_channel_get_handle (McdChannel *channel)
 {
@@ -961,10 +901,9 @@ mcd_channel_get_handle (McdChannel *channel)
             if (valid)
                 return handle;
         }
-        return priv->request_data->target_handle;
     }
-    else
-        return 0;
+
+    return 0;
 }
 
 TpHandleType
diff --git a/src/mcd-channel.h b/src/mcd-channel.h
index e198b85..56fa25c 100644
--- a/src/mcd-channel.h
+++ b/src/mcd-channel.h
@@ -111,7 +111,6 @@ gboolean mcd_channel_get_members_accepted (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);
-void mcd_channel_set_handle (McdChannel *channel, guint handle);
 guint mcd_channel_get_handle (McdChannel *channel);
 TpHandleType mcd_channel_get_handle_type (McdChannel *channel);
 const gchar *mcd_channel_get_name (McdChannel *channel);
-- 
1.5.6.5