[telepathy-mission-control/master] Remove deprecated APIs and deprecate more

[Alberto Mardegan]

---
 .../libmissioncontrol-server-sections.txt          |    2 --
 .../tmpl/mcd-dispatcher-context.sgml               |   18 ------------------
 src/mcd-dispatcher-context.h                       |   10 +++-------
 src/mcd-dispatcher.c                               |    7 -------
 4 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/doc/reference/libmissioncontrol-server/libmissioncontrol-server-sections.txt b/doc/reference/libmissioncontrol-server/libmissioncontrol-server-sections.txt
index e14e12e..ee00fa5 100644
--- a/doc/reference/libmissioncontrol-server/libmissioncontrol-server-sections.txt
+++ b/doc/reference/libmissioncontrol-server/libmissioncontrol-server-sections.txt
@@ -274,8 +274,6 @@ mcd_dispatcher_context_get_channel
 mcd_dispatcher_context_get_channels
 mcd_dispatcher_context_get_channel_by_type
 mcd_dispatcher_context_get_connection
-mcd_dispatcher_context_get_chan_handler
-mcd_dispatcher_context_get_members
 mcd_dispatcher_context_process
 </SECTION>
 
diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher-context.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher-context.sgml
index dfa71e3..1de00c6 100644
--- a/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher-context.sgml
+++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher-context.sgml
@@ -161,24 +161,6 @@ mcd-dispatcher-context
 @Returns: 
 
 
-<!-- ##### FUNCTION mcd_dispatcher_context_get_chan_handler ##### -->
-<para>
-
-</para>
-
- at ctx: 
- at Returns: 
-
-
-<!-- ##### FUNCTION mcd_dispatcher_context_get_members ##### -->
-<para>
-
-</para>
-
- at ctx: 
- at Returns: 
-
-
 <!-- ##### FUNCTION mcd_dispatcher_context_process ##### -->
 <para>
 
diff --git a/src/mcd-dispatcher-context.h b/src/mcd-dispatcher-context.h
index a696bd3..a2541cc 100644
--- a/src/mcd-dispatcher-context.h
+++ b/src/mcd-dispatcher-context.h
@@ -76,9 +76,9 @@ void mcd_dispatcher_add_filters (McdDispatcher *dispatcher,
 
 McdDispatcher* mcd_dispatcher_context_get_dispatcher (McdDispatcherContext * ctx);
 
-TpChannel *mcd_dispatcher_context_get_channel_object (McdDispatcherContext * ctx);
+TpChannel *mcd_dispatcher_context_get_channel_object (McdDispatcherContext * ctx) G_GNUC_DEPRECATED;
 
-TpConnection *mcd_dispatcher_context_get_connection_object (McdDispatcherContext * ctx);
+TpConnection *mcd_dispatcher_context_get_connection_object (McdDispatcherContext * ctx) G_GNUC_DEPRECATED;
 
 McdChannel * mcd_dispatcher_context_get_channel (McdDispatcherContext * ctx);
 const GList *mcd_dispatcher_context_get_channels
@@ -89,10 +89,6 @@ McdChannel *mcd_dispatcher_context_get_channel_by_type
 McdConnection *mcd_dispatcher_context_get_connection
     (McdDispatcherContext *context);
 
-/*Returns an array of the gchar *  addresses of participants in the channel*/
-GPtrArray *mcd_dispatcher_context_get_members (McdDispatcherContext * ctx)
-    G_GNUC_DEPRECATED;
-
 /* Statemachine API section */
 
 /* Will step through the state machine.
@@ -102,7 +98,7 @@ GPtrArray *mcd_dispatcher_context_get_members (McdDispatcherContext * ctx)
 
 void mcd_dispatcher_context_process (McdDispatcherContext * ctx, gboolean result);
 
-const gchar *mcd_dispatcher_context_get_protocol_name (McdDispatcherContext *);
+const gchar *mcd_dispatcher_context_get_protocol_name (McdDispatcherContext *) G_GNUC_DEPRECATED;
 
 G_END_DECLS
 
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 3f6a8b4..d7f903d 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -2473,13 +2473,6 @@ mcd_dispatcher_context_get_channel_by_type (McdDispatcherContext *context,
     return NULL;
 }
 
-/*Returns an array of the participants in the channel*/
-GPtrArray *
-mcd_dispatcher_context_get_members (McdDispatcherContext * ctx)
-{
-    return NULL;
-}
-
 GPtrArray *
 _mcd_dispatcher_get_channel_capabilities (McdDispatcher *dispatcher,
                                           const gchar *protocol)
-- 
1.5.6.5