summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS11
-rw-r--r--configure.ac4
-rw-r--r--extensions/Channel_Type_File_Transfer.xml513
-rw-r--r--extensions/Makefile.am1
-rw-r--r--extensions/channel.xml1
-rw-r--r--lib/gibber/tests/mesh.py (renamed from tests/mesh.py)0
-rw-r--r--lib/gibber/tests/simplemeshtest.py (renamed from tests/simplemeshtest.py)0
-rw-r--r--src/salut-connection.c4
-rw-r--r--src/salut-file-transfer-channel.c144
-rw-r--r--src/salut-ft-manager.c48
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/twisted/avahi/file_transfer_helper.py4
-rw-r--r--tests/twisted/avahi/test-disabled-1-1-tubes.py4
-rw-r--r--tests/twisted/avahi/test-tube-close.py7
-rw-r--r--tests/twisted/avahi/test-tube.py4
-rw-r--r--tests/twisted/avahi/test-two-tubes.py4
-rw-r--r--tests/twisted/avahi/tubes-to-nonexistant-ids.py4
17 files changed, 131 insertions, 624 deletions
diff --git a/NEWS b/NEWS
index 1605cb98..6b2b261a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,15 @@
-telepathy-salut 0.3.8 (UNRELEASED)
+telepathy-salut 0.3.8 (2009-02-17)
==================================
+The "Thursday as if I walked in the dessert" release.
Enhancements:
-* Implement org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT.
+* Switched to the stable version of the FileTransfer interface. Clients
+ (Empathy, Sugar...) have to be modified to use the stable interface instead
+ of the DRAFT one. Just the interface name has been renamed so changes
+ should be trivial.
+
+Fixes:
+* Fixe a crash when receiving an incoming XMPP connection from a IPv6 address.
telepathy-salut 0.3.7 (2009-01-05)
diff --git a/configure.ac b/configure.ac
index c1ceb606..8ac4b08f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_PREREQ([2.59])
m4_define([salut_major_version], [0])
m4_define([salut_minor_version], [3])
-m4_define([salut_micro_version], [7])
+m4_define([salut_micro_version], [8])
m4_define([salut_nano_version], [1])
# Some magic
@@ -175,7 +175,7 @@ AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
dnl Check for telepathy-glib
-PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= 0.7.17])
+PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= 0.7.23])
AC_SUBST(TELEPATHY_GLIB_CFLAGS)
AC_SUBST(TELEPATHY_GLIB_LIBS)
diff --git a/extensions/Channel_Type_File_Transfer.xml b/extensions/Channel_Type_File_Transfer.xml
deleted file mode 100644
index a2432f4b..00000000
--- a/extensions/Channel_Type_File_Transfer.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Channel_Type_File_Transfer" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <tp:copyright>
- Copyright (C) 2008 Collabora Limited
- </tp:copyright>
- <tp:license xmlns="http://www.w3.org/1999/xhtml">
- <p>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.</p>
-
-<p>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
-Library General Public License for more details.</p>
-
-<p>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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
- </tp:license>
- <interface name="org.freedesktop.Telepathy.Channel.Type.FileTransfer.DRAFT"
- tp:causes-havoc="experimental">
- <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>A channel type for transferring files. The
- transmission of data between contacts is achieved by reading from
- or writing to a socket. The type of the socket (local Unix, IPv4,
- etc.) is decided on when the file transfer is offered or accepted.</p>
-
- <p>A socket approach is used to make the transfer less dependent on both
- client and connection manager knowing the same protocols. As an example,
- when browsing an SMB share in a file manager, one selects "Send file"
- and chooses a contact. Instead of passing a URL which would then require
- the connection manager to connect to the SMB share itself, the client
- passes a stream from which the connection manager reads, requiring no
- further connection to the share. It also allows connection managers to
- be more restricted in their access to the system, allowing tighter
- security policies with eg SELinux, or more flexible deployments which
- cross user or system boundaries.</p>
-
- <p>The Telepathy client should connect to the socket or address that
- the connection manager has set up and provided back to the clients
- through the two methods.</p>
-
- <ul><li>In order to send a file, one should request a FileTransfer
- channel for a contact, including at least the mandatory properties
- (<tp:member-ref>Filename</tp:member-ref>,
- <tp:member-ref>Size</tp:member-ref> and <tp:member-ref>ContentType</tp:member-ref>).
- Then, one should
- call <tp:member-ref>ProvideFile</tp:member-ref> to configure the socket that
- will be used to transfer the file.</li>
-
- <li>In order to receive an incoming file transfer, one should call
- <tp:member-ref>AcceptFile</tp:member-ref> and then wait until the state
- changes to Open. When the receiver wants to resume a transfer, the Offset
- argument should be should be set to a non-zero value when calling
- <tp:member-ref>AcceptFile</tp:member-ref>.</li>
-
- <li>Once the offset has been negotiated, the
- <tp:member-ref>InitialOffsetDefined</tp:member-ref> signal
- is emitted and the <tp:member-ref>InitialOffset</tp:member-ref> property
- is defined. The <tp:member-ref>InitialOffsetDefined</tp:member-ref>
- signal is emitted before channel becomes Open.
- The receiver MUST check the value of
- <tp:member-ref>InitialOffset</tp:member-ref> for a difference in offset
- from the requested value in AcceptFile.</li>
-
- <li>When the state changes to Open, Clients can start the transfer of the
- file using the offset previously announced.
- </li></ul>
-
- <p>If something goes wrong with the transfer,
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Close</tp:dbus-ref>
- should be called on the channel.</p>
-
- <p>The File channel type may be requested for handles of type
- HANDLE_TYPE_CONTACT. If the channel is requested for any other
- handle type then the behaviour is undefined.</p>
- </tp:docstring>
-
- <property name="State" type="u" tp:type="File_Transfer_State"
- access="read" tp:name-for-bindings="State">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The state of the file transfer as described by the
- File_Transfer_State enum.</p>
- </tp:docstring>
- </property>
-
- <property name="ContentType" type="s" access="read"
- tp:name-for-bindings="Content_Type">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The file's MIME type. This cannot change once the channel has
- been created.</p>
-
- <p>This property is mandatory when requesting the channel with the
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>
- method. Protocols which do not have a content-type property with file
- transfers should set this value to application/octet-stream.</p>
- </tp:docstring>
- </property>
-
- <property name="Filename" type="s" access="read"
- tp:name-for-bindings="Filename">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The name of the file on the sender's side. This is therefore given
- as a suggested filename for the receiver. This cannot change
- once the channel has been created.</p>
-
- <p>This property should be the basename of the file being sent. For example,
- if the sender sends the file /home/user/monkey.pdf then this property should
- be set to monkey.pdf.</p>
-
- <p>This property is mandatory when requesting the channel with the
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>
- method. This property cannot be empty and MUST be set to a sensible value.</p>
- </tp:docstring>
- </property>
-
- <property name="Size" type="t" access="read"
- tp:name-for-bindings="Size">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The size of the file. If this property is set, then the file
- transfer is guaranteed to be this size. This cannot change once
- the channel has been created.</p>
-
- <p>When you are creating a channel with this property, its value
- MUST be accurate and in bytes. However, when receiving a file, this
- property still MUST be in bytes but might not be entirely accurate
- to the byte.</p>
-
- <p>This property is mandatory when requesting the channel with the
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>
- method. If this information isn't provided in the protocol, connection managers MUST set it
- to UINT64_MAX.</p>
- </tp:docstring>
- </property>
-
- <property name="ContentHashType" type="u" tp:type="File_Hash_Type"
- access="read" tp:name-for-bindings="Content_Hash_Type">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The type of the <tp:member-ref>ContentHash</tp:member-ref> property.</p>
-
- <p>This property is optional when requesting the channel with the
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>
- method. However, if you wish to include the <tp:member-ref>ContentHash</tp:member-ref>
- property you MUST also include this property. If you omit this property from a
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>
- method call then its value will be assumed to be File_Hash_Type_None.</p>
- </tp:docstring>
- </property>
-
- <property name="ContentHash" type="s" access="read"
- tp:name-for-bindings="Content_Hash">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>Hash of the contents of the file transfer, of type described
- in the value of the <tp:member-ref>ContentHashType</tp:member-ref>
- property.</p>
-
- <p>This property is optional when requesting the channel with the
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>
- method. Its value MUST correspond to the appropriate type of the
- <tp:member-ref>ContentHashType</tp:member-ref> property. If the
- ContentHashType property is not set, or set to File_Hash_Type_None,
- then this property will not even be looked at.</p>
- </tp:docstring>
- </property>
-
- <property name="Description" type="s" access="read"
- tp:name-for-bindings="Description">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>Description of the file transfer. This cannot change once the
- channel has been created.</p>
-
- <p>This property is optional when requesting the channel with the
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>
- method. If this property was not provided by the remote party, connection managers MUST set it to
- the empty string.</p>
- </tp:docstring>
- </property>
-
- <property name="Date" type="t" access="read"
- tp:type="Unix_Timestamp64" tp:name-for-bindings="Date">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The last modification time of the file being transferred. This
- cannot change once the channel has been created</p>
-
- <p>This property is optional when requesting the channel with the
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>
- method.</p>
- </tp:docstring>
- </property>
-
- <property name="AvailableSocketTypes" type="a{uau}"
- tp:type="Supported_Socket_Map" access="read"
- tp:name-for-bindings="Available_Socket_Types">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>A mapping from address types (members of Socket_Address_Type) to
- arrays of access-control type (members of Socket_Access_Control)
- that the connection manager supports for sockets with that
- address type. For simplicity, if a CM supports offering a
- particular type of file transfer, it is assumed to support accepting
- it. Connection Managers MUST support at least Socket_Address_Type_IPv4.</p>
-
- <p>A typical value for a host without IPv6 support:</p>
-
- <pre>
- {
- Socket_Address_Type_IPv4:
- [Socket_Access_Control_Localhost, Socket_Access_Control_Port,
- Socket_Access_Control_Netmask],
- Socket_Address_Type_Unix:
- [Socket_Access_Control_Localhost, Socket_Access_Control_Credentials]
- }
- </pre>
- </tp:docstring>
- </property>
-
- <property name="TransferredBytes" type="t" access="read"
- tp:name-for-bindings="Transferred_Bytes">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The number of bytes that have been transferred at the time of
- requesting the property. This will be updated as the file transfer
- continues.</p>
- </tp:docstring>
- </property>
-
- <property name="InitialOffset" type="t" access="read"
- tp:name-for-bindings="Initial_Offset">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The offset in bytes from where the file should be sent. This MUST
- be respected by both the receiver and the sender after the state
- becomes Open, but before any data is sent or received. Until the
- <tp:member-ref>InitialOffsetDefined</tp:member-ref> signal
- is emitted, this property is undefined.</p>
-
- <p>Before setting the <tp:member-ref>State</tp:member-ref> property to
- Open, the connection manager MUST set the InitialOffset property,
- possibly to 0.</p>
-
- <p>This property MUST NOT change after the state of the transfer has
- changed to Open.</p>
- </tp:docstring>
- </property>
-
- <tp:enum name="File_Transfer_State" type="u">
- <tp:enumvalue suffix="None" value="0">
- <tp:docstring>
- An invalid state type used as a null value. This value MUST NOT
- appear in the State property.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="Pending" value="1">
- <tp:docstring>
- The file transfer is waiting to be accepted/closed by the receiver.
- The receiver has to call <tp:member-ref>AcceptFile</tp:member-ref>,
- then wait for the state to change to Open and check the offset value.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="Accepted" value="2">
- <tp:docstring>
- The receiver has accepted the transfer. The sender now has to
- call <tp:member-ref>ProvideFile</tp:member-ref> to actually start the transfer.
- The receiver should now wait for the state to change to Open
- and check the offset value.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="Open" value="3">
- <tp:docstring>
- The file transfer is open for traffic.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="Completed" value="4">
- <tp:docstring>
- The file transfer has been completed successfully.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="Cancelled" value="5">
- <tp:docstring>
- The file transfer has been cancelled.
- </tp:docstring>
- </tp:enumvalue>
- </tp:enum>
-
- <tp:enum name="File_Transfer_State_Change_Reason" type="u">
- <tp:enumvalue suffix="None" value="0">
- <tp:docstring>
- No reason was specified.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="Requested" value="1">
- <tp:docstring>
- The change in state was requested.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="Local_Stopped" value="2">
- <tp:docstring>
- The file transfer was cancelled by the local user.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="Remote_Stopped" value="3">
- <tp:docstring>
- The file transfer was cancelled by the remote user.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="Local_Error" value="4">
- <tp:docstring>
- The file transfer was cancelled because of a local error.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="Remote_Error" value="5">
- <tp:docstring>
- The file transfer was cancelled because of a remote error.
- </tp:docstring>
- </tp:enumvalue>
- </tp:enum>
-
- <tp:enum name="File_Hash_Type" type="u">
- <tp:enumvalue suffix="None" value="0">
- <tp:docstring>
- No hash.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="MD5" value="1">
- <tp:docstring>
- MD5 digest as a string of 32 ASCII hex digits.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="SHA1" value="2">
- <tp:docstring>
- SHA1 digest as a string of ASCII hex digits.
- </tp:docstring>
- </tp:enumvalue>
- <tp:enumvalue suffix="SHA256" value="3">
- <tp:docstring>
- SHA256 digest as a string of ASCII hex digits.
- </tp:docstring>
- </tp:enumvalue>
- </tp:enum>
-
- <method name="AcceptFile" tp:name-for-bindings="Accept_File">
- <tp:docstring>
- Accept a file transfer that's in the Pending state. The file
- transfer's state becomes Accepted after this method is called.
- At this point the client can connect to the socket. CM MUST emit
- <tp:member-ref>InitialOffsetDefined</tp:member-ref> and change
- the state to Open before writing to the socket.
- Then <tp:member-ref>InitialOffset</tp:member-ref> should be respected in case
- its value differs from the offset that was specified as an argument
- to AcceptFile.
- </tp:docstring>
- <arg direction="in" name="Address_Type" type="u" tp:type="Socket_Address_Type">
- <tp:docstring>
- The type of address the connection manager should listen on.
- </tp:docstring>
- </arg>
- <arg direction="in" name="Access_Control" type="u" tp:type="Socket_Access_Control">
- <tp:docstring>
- The type of access control the connection manager should apply to
- the socket.
- </tp:docstring>
- </arg>
- <arg direction="in" name="Access_Control_Param" type="v">
- <tp:docstring>
- A parameter for the access control type, to be interpreted as
- specified in the documentation for the Socket_Access_Control enum.
- </tp:docstring>
- </arg>
- <arg direction="in" name="Offset" type="t">
- <tp:docstring>
- The desired offset in bytes where the file transfer should start.
- The offset is taken from the beginning of the file. Specifying an
- offset of zero will start the transfer from the beginning of the
- file. The offset that is actually given in the
- <tp:member-ref>InitialOffset</tp:member-ref> property can differ
- from this argument where the requested offset is not supported.
- (For example, some protocols do not support offsets at all so
- the InitialOffset property will always be 0.)
- </tp:docstring>
- </arg>
- <arg direction="out" name="Address" type="v">
- <tp:docstring>
- The address on which the connection manager will listen for
- connections for this file transfer.
- </tp:docstring>
- </arg>
-
- <tp:possible-errors>
- <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented">
- <tp:docstring>
- The given address type or access-control mechanism is not supported.
- </tp:docstring>
- </tp:error>
- <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
- <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/>
- <tp:docstring>
- Your address type, access control, access control parameter,
- offset, or a combination of all four is invalid.
- </tp:docstring>
- <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
- <tp:docstring>
- The file transfer is not in the Pending state, there isn't
- or there is a local error with acquiring a socket.
- </tp:docstring>
- </tp:error>
- </tp:possible-errors>
- </method>
-
- <method name="ProvideFile" tp:name-for-bindings="Provide_File">
- <tp:docstring>
- Provide the file for an outgoing file transfer which has been offered.
- Opens a socket that the client can use to provide a file to the connection manager.
- The channel MUST have been requested, and will change state
- to Open when this method is called if its state was Accepted.
- </tp:docstring>
- <arg direction="in" name="Address_Type" type="u" tp:type="Socket_Address_Type">
- <tp:docstring>
- The type of address the connection manager should listen on.
- </tp:docstring>
- </arg>
- <arg direction="in" name="Access_Control" type="u" tp:type="Socket_Access_Control">
- <tp:docstring>
- The type of access control the connection manager should apply to
- the socket.
- </tp:docstring>
- </arg>
- <arg direction="in" name="Access_Control_Param" type="v">
- <tp:docstring>
- A parameter for the access control type, to be interpreted as
- specified in the documentation for the Socket_Access_Control enum.
- </tp:docstring>
- </arg>
- <arg direction="out" name="Address" type="v">
- <tp:docstring>
- The address on which the connection manager will listen for
- connections for this file transfer.
- </tp:docstring>
- </arg>
-
- <tp:possible-errors>
- <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented">
- <tp:docstring>
- The given address type or access-control mechanism is not supported.
- </tp:docstring>
- </tp:error>
- <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/>
- <tp:docstring>
- Your address type, access control, access control parameter, or
- a combination of all three is invalid.
- </tp:docstring>
- <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
- <tp:docstring>
- Channel is not an outgoing transfer, ProvideFile has already been called,
- or there was a local error acquiring the socket.
- </tp:docstring>
- </tp:error>
- </tp:possible-errors>
- </method>
-
- <signal name="FileTransferStateChanged"
- tp:name-for-bindings="File_Transfer_State_Changed">
- <tp:docstring>
- Emitted when the state of a file transfer changes.
- </tp:docstring>
- <arg name="State" type="u" tp:type="File_Transfer_State">
- <tp:docstring>
- The new state of the file transfer; see the File_Transfer_State enumeration.
- </tp:docstring>
- </arg>
- <arg name="Reason" type="u" tp:type="File_Transfer_State_Change_Reason">
- <tp:docstring>
- The reason for the state change; see the File_Transfer_State_Change_Reason
- enumeration.
- The value will always be File_Transfer_State_Change_Reason_None, except
- when changing state to cancelled.
- </tp:docstring>
- </arg>
- </signal>
-
- <signal name="TransferredBytesChanged"
- tp:name-for-bindings="Transferred_Bytes_Changed">
- <tp:docstring>
- Emitted when the number of transferred bytes changes. This will not be
- signalled with every single byte change. Instead, the most frequent
- this signal will be emitted is once a second. This should be
- sufficient, and the <tp:member-ref>TransferredBytes</tp:member-ref>
- property SHOULD NOT be polled.
- </tp:docstring>
- <arg name="Count" type="t">
- <tp:docstring>
- The number of already transferred bytes.
- </tp:docstring>
- </arg>
- </signal>
-
- <signal name="InitialOffsetDefined"
- tp:name-for-bindings="Initial_Offset_Defined">
- <tp:docstring>
- Emitted when the value of the <tp:member-ref>InitialOffset</tp:member-ref>
- property has been negotiated. This signal MUST be emitted before the channel
- becomes Open and clients have to use this offset when transferring the
- file.
- </tp:docstring>
- <arg name="InitialOffset" type="t">
- <tp:docstring>
- The value of the <tp:member-ref>InitialOffset</tp:member-ref> property.
- </tp:docstring>
- </arg>
- </signal>
-
- </interface>
-
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index c6c0de91..3b3e20f2 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -2,7 +2,6 @@ tools_dir = $(top_srcdir)/tools
EXTRA_DIST = \
Connection_Interface_Contact_Capabilities.xml \
- Channel_Type_File_Transfer.xml \
Channel_Type_Stream_Tube.xml \
Channel_Type_DBus_Tube.xml \
Channel_Interface_Tube.xml \
diff --git a/extensions/channel.xml b/extensions/channel.xml
index 14962f0d..9cc19cf3 100644
--- a/extensions/channel.xml
+++ b/extensions/channel.xml
@@ -22,7 +22,6 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p>
</tp:license>
-<xi:include href="Channel_Type_File_Transfer.xml"/>
<xi:include href="Channel_Future.xml"/>
</tp:spec>
diff --git a/tests/mesh.py b/lib/gibber/tests/mesh.py
index e0a7fef8..e0a7fef8 100644
--- a/tests/mesh.py
+++ b/lib/gibber/tests/mesh.py
diff --git a/tests/simplemeshtest.py b/lib/gibber/tests/simplemeshtest.py
index 575eeb94..575eeb94 100644
--- a/tests/simplemeshtest.py
+++ b/lib/gibber/tests/simplemeshtest.py
diff --git a/src/salut-connection.c b/src/salut-connection.c
index af2d2844..d5d75743 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -3195,15 +3195,19 @@ salut_connection_create_channel_managers (TpBaseConnection *base)
priv->roomlist_manager = salut_discovery_client_create_roomlist_manager (
priv->discovery_client, self, priv->xmpp_connection_manager);
+#if 0
priv->tubes_manager = salut_tubes_manager_new (self, priv->contact_manager,
priv->xmpp_connection_manager);
+#endif
g_ptr_array_add (managers, priv->im_manager);
g_ptr_array_add (managers, priv->contact_manager);
g_ptr_array_add (managers, priv->ft_manager);
g_ptr_array_add (managers, priv->muc_manager);
g_ptr_array_add (managers, priv->roomlist_manager);
+#if 0
g_ptr_array_add (managers, priv->tubes_manager);
+#endif
return managers;
}
diff --git a/src/salut-file-transfer-channel.c b/src/salut-file-transfer-channel.c
index cf6fad34..3ec1a103 100644
--- a/src/salut-file-transfer-channel.c
+++ b/src/salut-file-transfer-channel.c
@@ -64,7 +64,7 @@ G_DEFINE_TYPE_WITH_CODE (SalutFileTransferChannel, salut_file_transfer_channel,
tp_dbus_properties_mixin_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL);
- G_IMPLEMENT_INTERFACE (SALUT_TYPE_SVC_CHANNEL_TYPE_FILE_TRANSFER,
+ G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_FILE_TRANSFER,
file_transfer_iface_init);
);
@@ -129,11 +129,11 @@ struct _SalutFileTransferChannelPrivate {
gboolean remote_accepted;
/* properties */
- SalutFileTransferState state;
+ TpFileTransferState state;
gchar *content_type;
gchar *filename;
guint64 size;
- SalutFileHashType content_hash_type;
+ TpFileHashType content_hash_type;
gchar *content_hash;
gchar *description;
GHashTable *available_socket_types;
@@ -167,8 +167,8 @@ salut_file_transfer_channel_init (SalutFileTransferChannel *obj)
}
static void salut_file_transfer_channel_set_state (
- SalutSvcChannelTypeFileTransfer *iface, SalutFileTransferState state,
- SalutFileTransferStateChangeReason reason);
+ TpSvcChannelTypeFileTransfer *iface, TpFileTransferState state,
+ TpFileTransferStateChangeReason reason);
static void
contact_lost_cb (SalutContact *contact,
@@ -176,7 +176,7 @@ contact_lost_cb (SalutContact *contact,
{
g_assert (contact == self->priv->contact);
- if (self->priv->state != SALUT_FILE_TRANSFER_STATE_PENDING)
+ if (self->priv->state != TP_FILE_TRANSFER_STATE_PENDING)
{
DEBUG ("%s was disconnected. Ignoring as there is still a chance to"
" be able to complete the transfer", contact->name);
@@ -185,9 +185,9 @@ contact_lost_cb (SalutContact *contact,
DEBUG ("%s was disconnected. Cancel file tranfer.", contact->name);
salut_file_transfer_channel_set_state (
- SALUT_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
- SALUT_FILE_TRANSFER_STATE_CANCELLED,
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED);
+ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
+ TP_FILE_TRANSFER_STATE_CANCELLED,
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED);
}
static void
@@ -206,7 +206,7 @@ salut_file_transfer_channel_get_property (GObject *object,
break;
case PROP_CHANNEL_TYPE:
g_value_set_static_string (value,
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
break;
case PROP_HANDLE_TYPE:
g_value_set_uint (value, TP_HANDLE_TYPE_CONTACT);
@@ -299,17 +299,17 @@ salut_file_transfer_channel_get_property (GObject *object,
TP_IFACE_CHANNEL, "Requested",
TP_IFACE_CHANNEL, "InitiatorHandle",
TP_IFACE_CHANNEL, "InitiatorID",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "State",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "ContentType",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Filename",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Size",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "ContentHashType",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "ContentHash",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Description",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Date",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "AvailableSocketTypes",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "TransferredBytes",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "InitialOffset",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "State",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "ContentType",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Filename",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Size",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "ContentHashType",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "ContentHash",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Description",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Date",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "AvailableSocketTypes",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "TransferredBytes",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "InitialOffset",
NULL));
break;
default:
@@ -356,9 +356,9 @@ salut_file_transfer_channel_set_property (GObject *object,
break;
case PROP_STATE:
salut_file_transfer_channel_set_state (
- SALUT_SVC_CHANNEL_TYPE_FILE_TRANSFER (object),
+ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (object),
g_value_get_uint (value),
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
break;
case PROP_CONTENT_TYPE:
g_free (self->priv->content_type);
@@ -496,7 +496,7 @@ salut_file_transfer_channel_class_init (
NULL,
channel_props
},
- { SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
+ { TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
tp_dbus_properties_mixin_getter_gobject_properties,
tp_dbus_properties_mixin_setter_gobject_properties,
file_props
@@ -599,7 +599,7 @@ salut_file_transfer_channel_class_init (
param_spec = g_param_spec_uint (
"state",
- "SalutFileTransferState state",
+ "TpFileTransferState state",
"State of the file transfer in this channel",
0,
G_MAXUINT,
@@ -655,7 +655,7 @@ salut_file_transfer_channel_class_init (
"Hash type",
0,
G_MAXUINT,
- SALUT_FILE_HASH_TYPE_NONE,
+ TP_FILE_HASH_TYPE_NONE,
G_PARAM_CONSTRUCT |
G_PARAM_READWRITE |
G_PARAM_STATIC_NICK |
@@ -827,14 +827,14 @@ salut_file_transfer_channel_close (TpSvcChannel *iface,
{
SalutFileTransferChannel *self = SALUT_FILE_TRANSFER_CHANNEL (iface);
- if (self->priv->state != SALUT_FILE_TRANSFER_STATE_COMPLETED &&
- self->priv->state != SALUT_FILE_TRANSFER_STATE_CANCELLED)
+ if (self->priv->state != TP_FILE_TRANSFER_STATE_COMPLETED &&
+ self->priv->state != TP_FILE_TRANSFER_STATE_CANCELLED)
{
gibber_file_transfer_cancel (self->priv->ft, 406);
salut_file_transfer_channel_set_state (
- SALUT_SVC_CHANNEL_TYPE_FILE_TRANSFER (iface),
- SALUT_FILE_TRANSFER_STATE_CANCELLED,
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_STOPPED);
+ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (iface),
+ TP_FILE_TRANSFER_STATE_CANCELLED,
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_STOPPED);
}
salut_file_transfer_channel_do_close (SALUT_FILE_TRANSFER_CHANNEL (iface));
@@ -852,7 +852,7 @@ salut_file_transfer_channel_get_channel_type (TpSvcChannel *iface,
DBusGMethodInvocation *context)
{
tp_svc_channel_return_from_get_channel_type (context,
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
}
/**
@@ -919,11 +919,11 @@ error_cb (GibberFileTransfer *ft,
}
salut_file_transfer_channel_set_state (
- SALUT_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
- SALUT_FILE_TRANSFER_STATE_CANCELLED,
+ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
+ TP_FILE_TRANSFER_STATE_CANCELLED,
receiver ?
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR :
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_ERROR);
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR :
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_ERROR);
}
static void
@@ -931,9 +931,9 @@ ft_finished_cb (GibberFileTransfer *ft,
SalutFileTransferChannel *self)
{
salut_file_transfer_channel_set_state (
- SALUT_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
- SALUT_FILE_TRANSFER_STATE_COMPLETED,
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
+ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
+ TP_FILE_TRANSFER_STATE_COMPLETED,
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
salut_xmpp_connection_manager_release_connection (
self->priv->xmpp_connection_manager,
@@ -946,9 +946,9 @@ ft_remote_cancelled_cb (GibberFileTransfer *ft,
{
gibber_file_transfer_cancel (ft, 406);
salut_file_transfer_channel_set_state (
- SALUT_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
- SALUT_FILE_TRANSFER_STATE_CANCELLED,
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED);
+ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
+ TP_FILE_TRANSFER_STATE_CANCELLED,
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED);
salut_xmpp_connection_manager_release_connection (
self->priv->xmpp_connection_manager,
@@ -964,21 +964,21 @@ remote_accepted_cb (GibberFileTransfer *ft,
if (self->priv->socket_path != NULL)
{
/* ProvideFile has already been called. Channel is Open */
- salut_svc_channel_type_file_transfer_emit_initial_offset_defined (self,
+ tp_svc_channel_type_file_transfer_emit_initial_offset_defined (self,
self->priv->initial_offset);
salut_file_transfer_channel_set_state (
- SALUT_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
- SALUT_FILE_TRANSFER_STATE_OPEN,
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
+ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
+ TP_FILE_TRANSFER_STATE_OPEN,
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
}
else
{
/* Client has to call ProvideFile to open the channel */
salut_file_transfer_channel_set_state (
- SALUT_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
- SALUT_FILE_TRANSFER_STATE_ACCEPTED,
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
+ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
+ TP_FILE_TRANSFER_STATE_ACCEPTED,
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
}
g_signal_connect (ft, "finished", G_CALLBACK (ft_finished_cb), self);
@@ -1074,9 +1074,9 @@ salut_file_transfer_channel_received_file_offer (SalutFileTransferChannel *self,
static void
salut_file_transfer_channel_set_state (
- SalutSvcChannelTypeFileTransfer *iface,
- SalutFileTransferState state,
- SalutFileTransferStateChangeReason reason)
+ TpSvcChannelTypeFileTransfer *iface,
+ TpFileTransferState state,
+ TpFileTransferStateChangeReason reason)
{
SalutFileTransferChannel *self = SALUT_FILE_TRANSFER_CHANNEL (iface);
@@ -1084,19 +1084,19 @@ salut_file_transfer_channel_set_state (
return;
self->priv->state = state;
- salut_svc_channel_type_file_transfer_emit_file_transfer_state_changed (iface,
+ tp_svc_channel_type_file_transfer_emit_file_transfer_state_changed (iface,
state, reason);
}
static void
emit_progress_update (SalutFileTransferChannel *self)
{
- SalutSvcChannelTypeFileTransfer *iface = \
- SALUT_SVC_CHANNEL_TYPE_FILE_TRANSFER (self);
+ TpSvcChannelTypeFileTransfer *iface = \
+ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self);
g_get_current_time (&self->priv->last_transferred_bytes_emitted);
- salut_svc_channel_type_file_transfer_emit_transferred_bytes_changed (
+ tp_svc_channel_type_file_transfer_emit_transferred_bytes_changed (
iface, self->priv->transferred_bytes);
if (self->priv->progress_timer != 0)
@@ -1258,7 +1258,7 @@ salut_file_transfer_channel_offer_file (SalutFileTransferChannel *self,
* on interface org.freedesktop.Telepathy.Channel.Type.FileTransfer
*/
static void
-salut_file_transfer_channel_accept_file (SalutSvcChannelTypeFileTransfer *iface,
+salut_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer *iface,
guint address_type,
guint access_control,
const GValue *access_control_param,
@@ -1277,7 +1277,7 @@ salut_file_transfer_channel_accept_file (SalutSvcChannelTypeFileTransfer *iface,
g_error_free (error);
}
- if (self->priv->state != SALUT_FILE_TRANSFER_STATE_PENDING)
+ if (self->priv->state != TP_FILE_TRANSFER_STATE_PENDING)
{
g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
"State is not pending; cannot accept file");
@@ -1309,22 +1309,22 @@ salut_file_transfer_channel_accept_file (SalutSvcChannelTypeFileTransfer *iface,
DEBUG ("local socket %s", self->priv->socket_path);
salut_file_transfer_channel_set_state (iface,
- SALUT_FILE_TRANSFER_STATE_ACCEPTED,
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED);
+ TP_FILE_TRANSFER_STATE_ACCEPTED,
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED);
g_value_init (&out_address, G_TYPE_STRING);
g_value_set_string (&out_address, self->priv->socket_path);
- salut_svc_channel_type_file_transfer_return_from_accept_file (context,
+ tp_svc_channel_type_file_transfer_return_from_accept_file (context,
&out_address);
self->priv->initial_offset = 0;
- salut_svc_channel_type_file_transfer_emit_initial_offset_defined (self,
+ tp_svc_channel_type_file_transfer_emit_initial_offset_defined (self,
self->priv->initial_offset);
- salut_file_transfer_channel_set_state (iface, SALUT_FILE_TRANSFER_STATE_OPEN,
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
+ salut_file_transfer_channel_set_state (iface, TP_FILE_TRANSFER_STATE_OPEN,
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
g_value_unset (&out_address);
}
@@ -1337,7 +1337,7 @@ salut_file_transfer_channel_accept_file (SalutSvcChannelTypeFileTransfer *iface,
*/
static void
salut_file_transfer_channel_provide_file (
- SalutSvcChannelTypeFileTransfer *iface,
+ TpSvcChannelTypeFileTransfer *iface,
guint address_type,
guint access_control,
const GValue *access_control_param,
@@ -1388,15 +1388,15 @@ salut_file_transfer_channel_provide_file (
{
/* Remote already accepted the file. Channel is Open.
* If not channel stay Pending. */
- salut_svc_channel_type_file_transfer_emit_initial_offset_defined (self,
+ tp_svc_channel_type_file_transfer_emit_initial_offset_defined (self,
self->priv->initial_offset);
salut_file_transfer_channel_set_state (iface,
- SALUT_FILE_TRANSFER_STATE_OPEN,
- SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED);
+ TP_FILE_TRANSFER_STATE_OPEN,
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED);
}
- salut_svc_channel_type_file_transfer_return_from_provide_file (context,
+ tp_svc_channel_type_file_transfer_return_from_provide_file (context,
&out_address);
g_value_unset (&out_address);
@@ -1406,10 +1406,10 @@ static void
file_transfer_iface_init (gpointer g_iface,
gpointer iface_data)
{
- SalutSvcChannelTypeFileTransferClass *klass =
- (SalutSvcChannelTypeFileTransferClass *) g_iface;
+ TpSvcChannelTypeFileTransferClass *klass =
+ (TpSvcChannelTypeFileTransferClass *) g_iface;
-#define IMPLEMENT(x) salut_svc_channel_type_file_transfer_implement_##x (\
+#define IMPLEMENT(x) tp_svc_channel_type_file_transfer_implement_##x (\
klass, salut_file_transfer_channel_##x)
IMPLEMENT (accept_file);
IMPLEMENT (provide_file);
diff --git a/src/salut-ft-manager.c b/src/salut-ft-manager.c
index e89d295f..d4c970ce 100644
--- a/src/salut-ft-manager.c
+++ b/src/salut-ft-manager.c
@@ -286,7 +286,7 @@ salut_ft_manager_new_channel (SalutFtManager *mgr,
return NULL;
}
- state = SALUT_FILE_TRANSFER_STATE_PENDING;
+ state = TP_FILE_TRANSFER_STATE_PENDING;
if (!requested)
{
/* incoming channel */
@@ -340,7 +340,7 @@ salut_ft_manager_handle_request (TpChannelManager *manager,
TpHandle handle;
const gchar *content_type, *filename, *content_hash, *description;
guint64 size, date, initial_offset;
- SalutFileHashType content_hash_type;
+ TpFileHashType content_hash_type;
GError *error = NULL;
gboolean valid;
GSList *requests = NULL;
@@ -350,7 +350,7 @@ salut_ft_manager_handle_request (TpChannelManager *manager,
/* We only support file transfer channels */
if (tp_strdiff (tp_asv_get_string (request_properties,
TP_IFACE_CHANNEL ".ChannelType"),
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
return FALSE;
/* And only contact handles */
@@ -374,7 +374,7 @@ salut_ft_manager_handle_request (TpChannelManager *manager,
}
content_type = tp_asv_get_string (request_properties,
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentType");
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentType");
if (content_type == NULL)
{
g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
@@ -383,7 +383,7 @@ salut_ft_manager_handle_request (TpChannelManager *manager,
}
filename = tp_asv_get_string (request_properties,
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Filename");
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Filename");
if (filename == NULL)
{
g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
@@ -392,7 +392,7 @@ salut_ft_manager_handle_request (TpChannelManager *manager,
}
size = tp_asv_get_uint64 (request_properties,
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Size", NULL);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Size", NULL);
if (size == 0)
{
g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
@@ -401,15 +401,15 @@ salut_ft_manager_handle_request (TpChannelManager *manager,
}
content_hash_type = tp_asv_get_uint32 (request_properties,
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHashType", &valid);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHashType", &valid);
if (!valid)
{
/* Assume File_Hash_Type_None */
- content_hash_type = SALUT_FILE_HASH_TYPE_NONE;
+ content_hash_type = TP_FILE_HASH_TYPE_NONE;
}
else
{
- if (content_hash_type >= NUM_SALUT_FILE_HASH_TYPES)
+ if (content_hash_type >= NUM_TP_FILE_HASH_TYPES)
{
g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
"%u is not a valid ContentHashType", content_hash_type);
@@ -417,10 +417,10 @@ salut_ft_manager_handle_request (TpChannelManager *manager,
}
}
- if (content_hash_type != SALUT_FILE_HASH_TYPE_NONE)
+ if (content_hash_type != TP_FILE_HASH_TYPE_NONE)
{
content_hash = tp_asv_get_string (request_properties,
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHash");
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHash");
if (content_hash == NULL)
{
g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
@@ -435,13 +435,13 @@ salut_ft_manager_handle_request (TpChannelManager *manager,
}
description = tp_asv_get_string (request_properties,
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Description");
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Description");
date = tp_asv_get_uint64 (request_properties,
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Date", NULL);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Date", NULL);
initial_offset = tp_asv_get_uint64 (request_properties,
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".InitialOffset", NULL);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".InitialOffset", NULL);
chan = salut_ft_manager_new_channel (self, handle, TRUE, &error);
if (chan == NULL)
@@ -493,15 +493,15 @@ static const gchar * const file_transfer_channel_allowed_properties[] =
{
TP_IFACE_CHANNEL ".TargetHandle",
TP_IFACE_CHANNEL ".TargetID",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentType",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Filename",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Size",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHashType",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHash",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Description",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Date",
- SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".InitialOffset",
- NULL
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentType",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Filename",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Size",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHashType",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHash",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Description",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Date",
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".InitialOffset",
+ NULL
};
static void
@@ -516,7 +516,7 @@ salut_ft_manager_foreach_channel_class (TpChannelManager *manager,
NULL, (GDestroyNotify) tp_g_value_slice_free);
value = tp_g_value_slice_new (G_TYPE_STRING);
- g_value_set_static_string (value, SALUT_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
+ g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType" , value);
value = tp_g_value_slice_new (G_TYPE_UINT);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 405e3b7a..3856abed 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,8 +10,6 @@ $(top_builddir)/lib/gibber/libgibber.la:
.PHONY: $(top_builddir)/lib/gibber/libgibber.la
-EXTRA_DIST = simplemeshtest.py mesh.py $(check_SCRIPTS)
-
noinst_PROGRAMS = \
telepathy-salut-debug
diff --git a/tests/twisted/avahi/file_transfer_helper.py b/tests/twisted/avahi/file_transfer_helper.py
index 0a3a00c6..ec3fdab8 100644
--- a/tests/twisted/avahi/file_transfer_helper.py
+++ b/tests/twisted/avahi/file_transfer_helper.py
@@ -18,7 +18,7 @@ from dbus import PROPERTIES_IFACE
CONNECTION_INTERFACE_REQUESTS = 'org.freedesktop.Telepathy.Connection.Interface.Requests'
CHANNEL_INTERFACE ='org.freedesktop.Telepathy.Channel'
-CHANNEL_TYPE_FILE_TRANSFER = 'org.freedesktop.Telepathy.Channel.Type.FileTransfer.DRAFT'
+CHANNEL_TYPE_FILE_TRANSFER = 'org.freedesktop.Telepathy.Channel.Type.FileTransfer'
HT_CONTACT = 1
HT_CONTACT_LIST = 3
@@ -117,7 +117,7 @@ class FileTransferTest(object):
def create_ft_channel(self):
self.channel = make_channel_proxy(self.conn, self.ft_path, 'Channel')
- self.ft_channel = make_channel_proxy(self.conn, self.ft_path, 'Channel.Type.FileTransfer.DRAFT')
+ self.ft_channel = make_channel_proxy(self.conn, self.ft_path, 'Channel.Type.FileTransfer')
self.ft_props = dbus.Interface(self.bus.get_object(
self.conn.object.bus_name, self.ft_path), PROPERTIES_IFACE)
diff --git a/tests/twisted/avahi/test-disabled-1-1-tubes.py b/tests/twisted/avahi/test-disabled-1-1-tubes.py
index 867c3200..e03589b7 100644
--- a/tests/twisted/avahi/test-disabled-1-1-tubes.py
+++ b/tests/twisted/avahi/test-disabled-1-1-tubes.py
@@ -35,9 +35,9 @@ sample_parameters = dbus.Dictionary({
'i': dbus.Int32(-123),
}, signature='sv')
-print "FIXME: test-disabled-1-1-tubes.py disabled because 1-1 tubes are enabled"
+#print "FIXME: test-disabled-1-1-tubes.py disabled because 1-1 tubes are enabled"
# exiting 77 causes automake to consider the test to have been skipped
-raise SystemExit(77)
+#raise SystemExit(77)
def test(q, bus, conn):
conn.Connect()
diff --git a/tests/twisted/avahi/test-tube-close.py b/tests/twisted/avahi/test-tube-close.py
index fe5bda7c..9c190bd8 100644
--- a/tests/twisted/avahi/test-tube-close.py
+++ b/tests/twisted/avahi/test-tube-close.py
@@ -23,9 +23,10 @@ HT_CONTACT_LIST = 3
SOCKET_ADDRESS_TYPE_IPV4 = dbus.UInt32(2)
SOCKET_ACCESS_CONTROL_LOCALHOST = dbus.UInt32(0)
-print "FIXME: test-tube-close.py disabled because sending a close stanza on "
-print "disconnection is not yet implemented in telepathy-salut. It requires "
-print "to ensure the XmppConnection and reestablish it"
+#print "FIXME: test-tube-close.py disabled because sending a close stanza on "
+#print "disconnection is not yet implemented in telepathy-salut. It requires "
+#print "to ensure the XmppConnection and reestablish it"
+print "FIXME: test-tube-close.py disabled because 1-1 tubes are disabled for now"
# exiting 77 causes automake to consider the test to have been skipped
raise SystemExit(77)
diff --git a/tests/twisted/avahi/test-tube.py b/tests/twisted/avahi/test-tube.py
index 845590e6..b8aa0f3d 100644
--- a/tests/twisted/avahi/test-tube.py
+++ b/tests/twisted/avahi/test-tube.py
@@ -37,6 +37,10 @@ sample_parameters = dbus.Dictionary({
test_string = "This string travels on a tube !"
+print "FIXME: test-tube.py disabled because 1-1 tubes are disabled for now"
+# exiting 77 causes automake to consider the test to have been skipped
+raise SystemExit(77)
+
def check_conn_properties(q, bus, conn, channel_list=None):
properties = conn.GetAll(
'org.freedesktop.Telepathy.Connection.Interface.Requests',
diff --git a/tests/twisted/avahi/test-two-tubes.py b/tests/twisted/avahi/test-two-tubes.py
index 0f3d2fb5..e2460083 100644
--- a/tests/twisted/avahi/test-two-tubes.py
+++ b/tests/twisted/avahi/test-two-tubes.py
@@ -31,6 +31,10 @@ sample_parameters = dbus.Dictionary({
test_string = "This string travels on a tube !"
+print "FIXME: test-two-tubes.py disabled because 1-1 tubes are disabled for now"
+# exiting 77 causes automake to consider the test to have been skipped
+raise SystemExit(77)
+
def test(q, bus, conn):
# define a basic tcp server that echoes what the client says, but with
diff --git a/tests/twisted/avahi/tubes-to-nonexistant-ids.py b/tests/twisted/avahi/tubes-to-nonexistant-ids.py
index 409c02cf..b4da97f3 100644
--- a/tests/twisted/avahi/tubes-to-nonexistant-ids.py
+++ b/tests/twisted/avahi/tubes-to-nonexistant-ids.py
@@ -16,6 +16,10 @@ import dbus
arbitrary_ids = [ "DooN4Bei@TheeK6bo-Tegh4aci", "ahrui1iM@Dai6igho-ADetaes3" ]
+print "FIXME: test-to-nonexistant-ids.py disabled because 1-1 tubes are disabled for now"
+# exiting 77 causes automake to consider the test to have been skipped
+raise SystemExit(77)
+
def test(q, bus, conn):
conn.Connect()
q.expect('dbus-signal', signal='StatusChanged', args=[0L, 0L])
View Lorry Controller Status