File telepathy-qt-0.14.1+svn2032.diff of Package libQtTelepathy0

--- telepathy-qt-0.14.1/CMakeLists.txt		2007-05-23 16:30:13.000000000 +0200
+++ telepathy-qt-0.14.1+svn2032/CMakeLists.txt		2006-12-12 09:44:13.000000000 +0100
@@ -19,12 +19,6 @@
     PATHS ${QDBUS_LIB_DIR}
 )
 
-SET (VERSION_MAJOR "0")
-SET (VERSION_MINOR "14")
-SET (VERSION_PATCH "1")
-SET (VERSION_SUFFIX "")
-SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
-
 # put the include dirs which are in the source or build tree
 # before all other include dirs, so the headers in the sources
 # are prefered over the already installed ones
@@ -57,22 +51,3 @@
 add_subdirectory(include)
 add_subdirectory(tests)
 
-# If the cmake version includes cpack, use it
-IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
-    SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Qt Telepathy library")
-    SET(CPACK_PACKAGE_VENDOR "INdT - Instituto Nokia de Tecnologia")
-    SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-    SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-    SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
-    SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
-    SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
-    SET(CPACK_PACKAGE_INSTALL_DIRECTORY "telepathy-qt ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-    SET(CPACK_SOURCE_PACKAGE_FILE_NAME "telepathy-qt-${VERSION}")
-    SET(CPACK_GENERATOR TGZ)
-    SET(CPACK_SOURCE_GENERATOR TGZ)
-    SET(CPACK_SOURCE_IGNORE_FILES CMakeCache.txt CMakeFiles Makefile progress.make cmake_install.cmake CPackConfig.cmake CPackSourceConfig.cmake "\\\\.svn" "\\\\.swp$" "\\\\.cvs" "\\\\.tar.gz" "\\\\.cxx")
-    SET(CPACK_SOURCE_TOPLEVEL_TAG "Linux-Source")
-    SET(CPACK_STRIP_FILES "")
-    SET(CPACK_SYSTEM_NAME "Linux")
-    INCLUDE(CPack)
-ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
--- telepathy-qt-0.14.1/include/QtTelepathy/Client/channeldtmfinterface.h		2007-05-23 16:30:13.000000000 +0200
+++ telepathy-qt-0.14.1+svn2032/include/QtTelepathy/Client/channeldtmfinterface.h		2007-07-19 17:39:11.000000000 +0200
@@ -1,15 +1,15 @@
 /*
  * This file was generated by dbusxml2cpp version 0.6
- * Command line was: dbusxml2cpp -i QtTelepathy/BaseTypes -i QtTelepathy/ChannelDTMFInterface -p channeldtmfinterface.h: ../../xml/tp-chan-iface-dtmf.xml
+ * Command line was: dbusxml2cpp -i QtTelepathy/BaseTypes -i QtTelepathy/ChannelDTMFInterface -p channeldtmfinterface.h: xml/tp-chan-iface-dtmf.xml
  *
- * dbusxml2cpp is Copyright (C) 2006 Trolltech AS. All rights reserved.
+ * dbusxml2cpp is Copyright (C) 2006 Trolltech ASA. All rights reserved.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef CHANNELDTMFINTERFACE_H_1159380630
-#define CHANNELDTMFINTERFACE_H_1159380630
+#ifndef CHANNELDTMFINTERFACE_H_1184790827
+#define CHANNELDTMFINTERFACE_H_1184790827
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -20,7 +20,7 @@
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
 #include "QtTelepathy/Common/BaseTypes"
-#include "QtTelepathy/Client/ChannelDTMFInterface"
+#include "QtTelepathy/Common/ChannelDTMFInterfaceTypes"
 
 /*
  * Proxy class for interface org.freedesktop.Telepathy.Channel.Interface.DTMF
@@ -38,21 +38,21 @@
     ~OrgFreedesktopTelepathyChannelInterfaceDTMFInterface();
 
 public Q_SLOTS: // METHODS
-    inline QDBusReply<void> SendDTMF(uint signal, uint duration)
+    inline QDBusReply<void> StartTone(uint stream_id, uchar event)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(signal) << qVariantFromValue(duration);
-        return callWithArgumentList(QDBus::Block, QLatin1String("SendDTMF"), argumentList);
+        argumentList << qVariantFromValue(stream_id) << qVariantFromValue(event);
+        return callWithArgumentList(QDBus::Block, QLatin1String("StartTone"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
-    void ReceivedDTMF(uint signal, uint duration);
+    void StopTone(uint stream_id);
 };
 
 namespace org {
   namespace freedesktop {
     namespace Telepathy {
-          typedef ::OrgFreedesktopTelepathyChannelInterfaceDTMFInterface ChannelDTMFInterface;
+      typedef ::OrgFreedesktopTelepathyChannelInterfaceDTMFInterface ChannelDTMFInterface;
     }
   }
 }
--- telepathy-qt-0.14.1/include/QtTelepathy/Common/ChannelDTMFInterfaceTypes		1970-01-01 01:00:00.000000000 +0100
+++ telepathy-qt-0.14.1+svn2032/include/QtTelepathy/Common/ChannelDTMFInterfaceTypes		2007-07-19 16:31:22.000000000 +0200
@@ -0,0 +1 @@
+#include "channeldtmfinterfacetypes.h"
--- telepathy-qt-0.14.1/include/QtTelepathy/Common/channeldtmfinterfacetypes.h		1970-01-01 01:00:00.000000000 +0100
+++ telepathy-qt-0.14.1+svn2032/include/QtTelepathy/Common/channeldtmfinterfacetypes.h		2007-07-19 16:31:22.000000000 +0200
@@ -0,0 +1,55 @@
+/*
+ * QtTelepathy, the Tapioca Qt4 Telepathy Client Library
+ * Copyright (C) 2006 by Tobias Hunger <tobias.hunger@basyskom.de>
+ * Copyright (C) 2006 by INdT
+ *  @author Andre Moreira Magalhaes <andre.magalhaes@indt.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef QTTELEPATHY_CHANNELTYPEDTMF_H
+#define QTTELEPATHY_CHANNELTYPEDTMF_H
+
+#include <QtTelepathy/Common/BaseTypes>
+
+namespace org {
+namespace freedesktop {
+namespace Telepathy {
+
+enum DTMF_Event {
+    DTMF_EVENT_Digit_0 = 0,
+    DTMF_EVENT_Digit_1 = 1,
+    DTMF_EVENT_Digit_2 = 2,
+    DTMF_EVENT_Digit_3 = 3,
+    DTMF_EVENT_Digit_4 = 4,
+    DTMF_EVENT_Digit_5 = 5,
+    DTMF_EVENT_Digit_6 = 6,
+    DTMF_EVENT_Digit_7 = 7,
+    DTMF_EVENT_Digit_8 = 8,
+    DTMF_EVENT_Digit_9 = 9,
+    DTMF_EVENT_Asterisk = 10,
+    DTMF_EVENT_Hash = 11,
+    DTMF_EVENT_Letter_A = 12,
+    DTMF_EVENT_Letter_B = 13,
+    DTMF_EVENT_Letter_C = 14,
+    DTMF_EVENT_Letter_D = 15
+};
+
+} // namespace Telepathy
+} // namespace freedesktop
+} // namespace org
+
+#endif
+
--- telepathy-qt-0.14.1/include/QtTelepathy/Common/channelgroupinterfacetypes.h		2007-05-23 16:30:13.000000000 +0200
+++ telepathy-qt-0.14.1+svn2032/include/QtTelepathy/Common/channelgroupinterfacetypes.h		2007-07-30 11:52:08.000000000 +0200
@@ -37,6 +37,8 @@
     CHANNEL_GROUP_FLAG_MESSAGE_REJECT           = 0x00000040,
     CHANNEL_GROUP_FLAG_MESSAGE_RESCIND          = 0x00000080,
     CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES = 0x00000100,
+    CHANNEL_GROUP_FLAG_ONLY_ONE_GROUP		= 0x00000200,
+    CHANNEL_GROUP_FLAG_HANDLE_OWNERS_NOT_AVAILABLE = 0x00000400,
     CHANNEL_GROUP_FLAG_ALL                      = 0xFFFFFFFF
 };
 Q_DECLARE_FLAGS(GroupFlags, GroupFlag)
--- telepathy-qt-0.14.1/include/QtTelepathy/Common/CMakeLists.txt		2007-05-23 16:30:13.000000000 +0200
+++ telepathy-qt-0.14.1+svn2032/include/QtTelepathy/Common/CMakeLists.txt		2007-07-19 16:31:22.000000000 +0200
@@ -7,6 +7,7 @@
     ChannelRoomListTypes
     ChannelStreamedMediaTypes
     ChannelTextTypes
+    ChannelDTMFInterfaceTypes
     ConnectionAliasingInterfaceTypes
     ConnectionCapabilitiesInterfaceTypes
     ConnectionManagerTypes
@@ -19,6 +20,7 @@
     channelroomlisttypes.h
     channelstreamedmediatypes.h
     channeltexttypes.h
+    channeldtmfinterfacetypes.h
     connectionaliasinginterfacetypes.h
     connectioncapabilitiesinterfacetypes.h
     connectionmanagertypes.h
--- telepathy-qt-0.14.1/include/QtTelepathy/Core/channelinterfacedtmfadaptor.h		2007-05-23 16:30:13.000000000 +0200
+++ telepathy-qt-0.14.1+svn2032/include/QtTelepathy/Core/channelinterfacedtmfadaptor.h		2007-07-19 16:31:22.000000000 +0200
@@ -1,6 +1,6 @@
 /*
  * This file was generated by dbusxml2cpp version 0.6
- * Command line was: dbusxml2cpp -i QtTelepathy/Common/BaseTypes -a include/QtTelepathy/Core/channelinterfacedtmfadaptor.h: xml/tp-chan-iface-dtmf.xml
+ * Command line was: dbusxml2cpp -i QtTelepathy/Common/BaseTypes -a include/QtTelepathy/Core/channelinterfacedtmfadaptor.h: xml/Channel_Interface_DTMF.xml
  *
  * dbusxml2cpp is Copyright (C) 2006 Trolltech ASA. All rights reserved.
  *
@@ -9,12 +9,12 @@
  * before re-generating it.
  */
 
-#ifndef CHANNELINTERFACEDTMFADAPTOR_H_1172489890
-#define CHANNELINTERFACEDTMFADAPTOR_H_1172489890
+#ifndef CHANNELINTERFACEDTMFADAPTOR_H_1184774481
+#define CHANNELINTERFACEDTMFADAPTOR_H_1184774481
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
-#include "QtTelepathy/Common/BaseTypes"
+#include <QtTelepathy/Common/BaseTypes>
 class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;
@@ -31,14 +31,113 @@
     Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Telepathy.Channel.Interface.DTMF")
     Q_CLASSINFO("D-Bus Introspection", ""
 "  <interface name=\"org.freedesktop.Telepathy.Channel.Interface.DTMF\" >\n"
-"    <method name=\"SendDTMF\" >\n"
-"      <arg direction=\"in\" type=\"u\" name=\"signal\" />\n"
-"      <arg direction=\"in\" type=\"u\" name=\"duration\" />\n"
+"    <tp:requires interface=\"org.freedesktop.Telepathy.Channel.Type.StreamedMedia\" />\n"
+"    <method name=\"StartTone\" >\n"
+"      <arg direction=\"in\" type=\"u\" name=\"stream_id\" >\n"
+"        <tp:docstring>A stream ID as defined in the StreamedMedia channel type.</tp:docstring>\n"
+"      </arg>\n"
+"      <arg direction=\"in\" tp:type=\"DTMF_Event\" type=\"y\" name=\"event\" >\n"
+"        <tp:docstring>A numeric event code from the DTMF_Event enum.</tp:docstring>\n"
+"      </arg>\n"
+"      <tp:docstring>\n"
+"        Start sending a DTMF tone on this stream. Where possible, the tone\n"
+"        will continue until StopTone is called. On certain protocols, it may\n"
+"        only be possible to send events with a predetermined length. In this\n"
+"        case, the implementation may emit a fixed-length tone, and the StopTone\n"
+"        method call should return NotAvailable.\n"
+"      </tp:docstring>\n"
+"      <tp:possible-errors>\n"
+"        <tp:error name=\"org.freedesktop.Telepathy.Error.NetworkError\" />\n"
+"        <tp:error name=\"org.freedesktop.Telepathy.Error.InvalidArgument\" >\n"
+"          <tp:docstring>\n"
+"            The given stream ID was invalid.\n"
+"          </tp:docstring>\n"
+"        </tp:error>\n"
+"        <tp:error name=\"org.freedesktop.Telepathy.Error.NotAvailable\" >\n"
+"          <tp:docstring>\n"
+"            The requested event is not available on this stream.\n"
+"          </tp:docstring>\n"
+"        </tp:error>\n"
+"      </tp:possible-errors>\n"
 "    </method>\n"
-"    <signal name=\"ReceivedDTMF\" >\n"
-"      <arg type=\"u\" name=\"signal\" />\n"
-"      <arg type=\"u\" name=\"duration\" />\n"
-"    </signal>\n"
+"    <method name=\"StopTone\" >\n"
+"      <arg direction=\"in\" type=\"u\" name=\"stream_id\" >\n"
+"        <tp:docstring>A stream ID as defined in the StreamedMedia channel type.</tp:docstring>\n"
+"      </arg>\n"
+"      <tp:docstring>\n"
+"        Stop sending any DTMF tone which has been started using the StartTone\n"
+"        method. If there is no current tone, this method will do nothing.\n"
+"      </tp:docstring>\n"
+"      <tp:possible-errors>\n"
+"        <tp:error name=\"org.freedesktop.Telepathy.Error.NetworkError\" />\n"
+"        <tp:error name=\"org.freedesktop.Telepathy.Error.InvalidArgument\" >\n"
+"          <tp:docstring>\n"
+"            The given stream ID was invalid.\n"
+"          </tp:docstring>\n"
+"        </tp:error>\n"
+"        <tp:error name=\"org.freedesktop.Telepathy.Error.NotAvailable\" >\n"
+"          <tp:docstring>\n"
+"            Continuous tones are not supported by this stream.\n"
+"          </tp:docstring>\n"
+"        </tp:error>\n"
+"      </tp:possible-errors>\n"
+"    </method>\n"
+"    <tp:enum type=\"y\" name=\"DTMF_Event\" >\n"
+"      <tp:enumvalue suffix=\"Digit_0\" value=\"0\" >\n"
+"        <tp:docstring>0</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Digit_1\" value=\"1\" >\n"
+"        <tp:docstring>1</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Digit_2\" value=\"2\" >\n"
+"        <tp:docstring>2</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Digit_3\" value=\"3\" >\n"
+"        <tp:docstring>3</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Digit_4\" value=\"4\" >\n"
+"        <tp:docstring>4</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Digit_5\" value=\"5\" >\n"
+"        <tp:docstring>5</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Digit_6\" value=\"6\" >\n"
+"        <tp:docstring>6</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Digit_7\" value=\"7\" >\n"
+"        <tp:docstring>7</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Digit_8\" value=\"8\" >\n"
+"        <tp:docstring>8</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Digit_9\" value=\"9\" >\n"
+"        <tp:docstring>9</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Asterisk\" value=\"10\" >\n"
+"        <tp:docstring>*</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Hash\" value=\"11\" >\n"
+"        <tp:docstring>#</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Letter_A\" value=\"12\" >\n"
+"        <tp:docstring>A</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Letter_B\" value=\"13\" >\n"
+"        <tp:docstring>B</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Letter_C\" value=\"14\" >\n"
+"        <tp:docstring>C</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"      <tp:enumvalue suffix=\"Letter_D\" value=\"15\" >\n"
+"        <tp:docstring>D</tp:docstring>\n"
+"      </tp:enumvalue>\n"
+"    </tp:enum>\n"
+"    <tp:docstring xmlns=\"http://www.w3.org/1999/xhtml\" >\n"
+"      An interface that gives a Channel the ability to send DTMF events over\n"
+"      audio streams which have been established using the StreamedMedia channel\n"
+"      type. The event codes used are in common with those defined in <a href=\"http://www.rfc-editor.org/rfc/rfc4733.txt\" >RFC4733</a>, and are\n"
+"      listed in the DTMF_Event enumeration.\n"
+"    </tp:docstring>\n"
 "  </interface>\n"
         "")
 public:
@@ -47,9 +146,9 @@
 
 public: // PROPERTIES
 public Q_SLOTS: // METHODS
-    void SendDTMF(uint signal, uint duration);
+    void StartTone(uint stream_id, uchar event);
+    void StopTone(uint stream_id);
 Q_SIGNALS: // SIGNALS
-    void ReceivedDTMF(uint signal, uint duration);
 };
 
 #endif
--- telepathy-qt-0.14.1/scripts/generate_core_sources_from_xml.sh		2007-05-23 16:30:13.000000000 +0200
+++ telepathy-qt-0.14.1+svn2032/scripts/generate_core_sources_from_xml.sh		2007-07-19 16:16:24.000000000 +0200
@@ -40,7 +40,7 @@
         done=1
         continue
     fi
-    if [[ "$xmlfile" =~ '^#' ]]
+    if [[ "$xmlfile" = '#' ]]
     then
         continue
     fi
--- telepathy-qt-0.14.1/src/Client/channeldtmfinterface.cpp		2007-05-23 16:30:13.000000000 +0200
+++ telepathy-qt-0.14.1+svn2032/src/Client/channeldtmfinterface.cpp		2007-07-19 15:01:05.000000000 +0200
@@ -1,8 +1,8 @@
 /*
  * This file was generated by dbusxml2cpp version 0.6
- * Command line was: dbusxml2cpp -i QtTelepathy/ChannelDTMFInterface -p :channeldtmfinterface.cpp ../xml/tp-chan-iface-dtmf.xml
+ * Command line was: dbusxml2cpp -i QtTelepathy/ChannelDTMFInterface -p :channeldtmfinterface.cpp xml/tp-chan-iface-dtmf.xml
  *
- * dbusxml2cpp is Copyright (C) 2006 Trolltech AS. All rights reserved.
+ * dbusxml2cpp is Copyright (C) 2006 Trolltech ASA. All rights reserved.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
--- telepathy-qt-0.14.1/src/Core/channelinterfacedtmfadaptor.cpp		2007-05-23 16:30:13.000000000 +0200
+++ telepathy-qt-0.14.1+svn2032/src/Core/channelinterfacedtmfadaptor.cpp		2007-07-19 16:31:22.000000000 +0200
@@ -1,6 +1,6 @@
 /*
  * This file was generated by dbusxml2cpp version 0.6
- * Command line was: dbusxml2cpp -i QtTelepathy/Core/ChannelInterfaceDTMFAdaptor -a :src/Core/channelinterfacedtmfadaptor.cpp xml/tp-chan-iface-dtmf.xml
+ * Command line was: dbusxml2cpp -i QtTelepathy/Core/ChannelInterfaceDTMFAdaptor -a :src/Core/channelinterfacedtmfadaptor.cpp xml/Channel_Interface_DTMF.xml
  *
  * dbusxml2cpp is Copyright (C) 2006 Trolltech ASA. All rights reserved.
  *
@@ -8,7 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#include "QtTelepathy/Core/ChannelInterfaceDTMFAdaptor"
+#include <QtTelepathy/Core/ChannelInterfaceDTMFAdaptor>
 #include <QtCore/QMetaObject>
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
@@ -33,9 +33,15 @@
     // destructor
 }
 
-void DTMFAdaptor::SendDTMF(uint signal, uint duration)
+void DTMFAdaptor::StartTone(uint stream_id, uchar event)
 {
-    // handle method call org.freedesktop.Telepathy.Channel.Interface.DTMF.SendDTMF
-    QMetaObject::invokeMethod(parent(), "SendDTMF", Q_ARG(uint, signal), Q_ARG(uint, duration));
+    // handle method call org.freedesktop.Telepathy.Channel.Interface.DTMF.StartTone
+    QMetaObject::invokeMethod(parent(), "StartTone", Q_ARG(uint, stream_id), Q_ARG(uchar, event));
+}
+
+void DTMFAdaptor::StopTone(uint stream_id)
+{
+    // handle method call org.freedesktop.Telepathy.Channel.Interface.DTMF.StopTone
+    QMetaObject::invokeMethod(parent(), "StopTone", Q_ARG(uint, stream_id));
 }
 
--- telepathy-qt-0.14.1/xml/tp-chan-iface-dtmf.xml		2007-05-23 16:30:13.000000000 +0200
+++ telepathy-qt-0.14.1+svn2032/xml/tp-chan-iface-dtmf.xml		2007-07-19 20:38:30.000000000 +0200
@@ -1,13 +1,12 @@
 <?xml version="1.0" ?>
 <node name="/TpChanIfaceDTMF">
   <interface name="org.freedesktop.Telepathy.Channel.Interface.DTMF">
-    <method name="SendDTMF">
-      <arg direction="in" name="signal" type="u"/>
-      <arg direction="in" name="duration" type="u"/>
+    <method name="StartTone">
+      <arg direction="in" name="stream_id" type="u"/>
+      <arg direction="in" name="event" type="y"/>
+    </method>
+    <method name="StopTone">
+      <arg direction="in" name="stream_id" type="u"/>
     </method>
-    <signal name="ReceivedDTMF">
-      <arg name="signal" type="u"/>
-      <arg name="duration" type="u"/>
-    </signal>
   </interface>
 </node>