[telepathy-mission-control/master] Compat: remove channel-requesting methods altogether

[Simon McVittie]

---
 src/mcd-account-compat.c         |   46 +--------------------------------
 xml/Account_Interface_Compat.xml |   51 --------------------------------------
 2 files changed, 2 insertions(+), 95 deletions(-)

diff --git a/src/mcd-account-compat.c b/src/mcd-account-compat.c
index 7f3cb70..bd4e8fc 100644
--- a/src/mcd-account-compat.c
+++ b/src/mcd-account-compat.c
@@ -153,53 +153,11 @@ const McdDBusProp account_compat_properties[] = {
     { 0 },
 };
 
-static void
-account_request_channel (McSvcAccountInterfaceCompat *self,
-			 const gchar *type,
-			 guint handle,
-			 gint handle_type,
-			 DBusGMethodInvocation *context)
-{
-    GError e = { TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
-        "No longer implemented" };
-
-    dbus_g_method_return_error (context, &e);
-}
-
-static void
-account_request_channel_with_string_handle (McSvcAccountInterfaceCompat *self,
-					    const gchar *type,
-					    const gchar *handle,
-					    gint handle_type,
-					    DBusGMethodInvocation *context)
-{
-    GError e = { TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
-        "No longer implemented" };
-
-    dbus_g_method_return_error (context, &e);
-}
-
-static void
-account_cancel_channel_request (McSvcAccountInterfaceCompat *self,
-				guint in_operation_id,
-				DBusGMethodInvocation *context)
-{
-    GError e = { TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
-        "No longer implemented" };
-
-    dbus_g_method_return_error (context, &e);
-}
-
 void
 account_compat_iface_init (McSvcAccountInterfaceCompatClass *iface,
-			   gpointer iface_data)
+                           gpointer iface_data)
 {
-#define IMPLEMENT(x) mc_svc_account_interface_compat_implement_##x (\
-    iface, account_##x)
-    IMPLEMENT(request_channel);
-    IMPLEMENT(request_channel_with_string_handle);
-    IMPLEMENT(cancel_channel_request);
-#undef IMPLEMENT
+    /* nothing to do */
 }
 
 /**
diff --git a/xml/Account_Interface_Compat.xml b/xml/Account_Interface_Compat.xml
index 6b4a539..af68a5b 100644
--- a/xml/Account_Interface_Compat.xml
+++ b/xml/Account_Interface_Compat.xml
@@ -23,57 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         libmissioncontrol compatible layer.</p>
     </tp:docstring>
 
-    <method name="RequestChannel">
-      <tp:docstring>
-        Requests a channel.
-      </tp:docstring>
-      <arg type="s" name="type" direction="in">
-        <tp:docstring>D-Bus interface name representing the channel type</tp:docstring>
-      </arg>
-      <arg type="u" name="handle" direction="in">
-        <tp:docstring>A nonzero integer handle representing a contact, room,
-          list, etc.</tp:docstring>
-      </arg>
-      <arg type="i" name="handle_type" direction="in">
-        <tp:docstring>A integer representing the channel type</tp:docstring>
-      </arg>
-      <arg type="u" name="operation_id" direction="out">
-        <tp:docstring>A integer representing an operation ID, which can then be
-          used for cancelling the request</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="RequestChannelWithStringHandle">
-      <tp:docstring>
-        Requests a channel by a string handle.
-      </tp:docstring>
-      <arg type="s" name="type" direction="in">
-        <tp:docstring>D-Bus interface name representing the channel type</tp:docstring>
-      </arg>
-      <arg type="s" name="handle" direction="in">
-        <tp:docstring>A string handle representing a contact, room, list,
-          etc.</tp:docstring>
-      </arg>
-      <arg type="i" name="handle_type" direction="in">
-        <tp:docstring>A integer representing the channel type</tp:docstring>
-      </arg>
-      <arg type="u" name="operation_id" direction="out">
-        <tp:docstring>A integer representing an operation ID, which can then be
-          used for cancelling the request</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="CancelChannelRequest">
-      <tp:docstring>
-        Cancel a channel request.
-      </tp:docstring>
-      <arg type="u" name="operation_id" direction="in">
-        <tp:docstring>The operation ID which identifies the channel request;
-          this is the same integet that was passed when making the
-          request</tp:docstring>
-      </arg>
-    </method>
-
     <property name="Profile" type="s" access="readwrite">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The name of the profile.</p>
-- 
1.5.6.5