Merge branch 'master' into requestotron-tubes-and-caps-with-complex-types-with-gibber-listener-REBASED

Conflicts:

	.gitignore

51 files changed, 981 insertions, 259 deletions

diff --git a/.gitignore b/.gitignore
index 47ef9734..ed6104f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,11 +109,8 @@ src/write-mgr-file
 stamp-h1
 telepathy-salut-*.tar.gz
 tests/check-main
-tests/outputs
 tests/sasl-test.db
-tests/test-xmpp-connection
 tests/test-r-multicast-{packet,sender,transport-io}
-tests/test-r-multicast-transport-io
 tests/twisted/config.py
 tests/twisted/tools/core
 tests/twisted/tools/exec-with-log.sh
@@ -133,3 +130,8 @@ tests/test-r-multicast-packet
 tests/test-r-sender
 tests/test-r-transport-io
 tests/telepathy-salut-debug
+
+lib/gibber/tests/check-main
+lib/gibber/tests/outputs
+lib/gibber/tests/test-xmpp-connection
+lib/gibber/tests/test-r-multicast-transport-io
diff --git a/configure.ac b/configure.ac
index bea28fb2..c1ceb606 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,13 +276,14 @@ AC_OUTPUT( Makefile                       \
            lib/Makefile                   \
            lib/gibber/Makefile            \
            lib/gibber/examples/Makefile   \
+           lib/gibber/tests/Makefile      \
+           lib/gibber/tests/inputs/Makefile \
            src/Makefile                   \
            m4/Makefile                    \
            data/Makefile                  \
            extensions/Makefile            \
            tools/Makefile                 \
            tests/Makefile                 \
-           tests/inputs/Makefile          \
            tests/twisted/Makefile         \
            tests/twisted/tools/Makefile   \
 )
diff --git a/extensions/Channel_Interface_Tube.xml b/extensions/Channel_Interface_Tube.xml
index 8e1ffab3..3e9a527a 100644
--- a/extensions/Channel_Interface_Tube.xml
+++ b/extensions/Channel_Interface_Tube.xml
@@ -38,10 +38,29 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       HANDLE_TYPE_CONTACT (for 1-1 communication) or of type
       HANDLE_TYPE_ROOM (to communicate with others in the room
       simultaneously).</p>
+
+      <p>As an exception to the usual handling of capabilities, connection managers
+        for protocols with capability discovery, such as XMPP, SHOULD advertise the
+        capability representing each Tube type that they support
+       (<tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Type.DBusTube</tp:dbus-ref> and/or
+        <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Type.StreamTube</tp:dbus-ref>)
+        even if no client has indicated via
+        <tp:dbus-ref
+          namespace="org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities.DRAFT">SetSelfCapabilities</tp:dbus-ref>
+        that such a tube is supported.</p>
+
+        <tp:rationale>
+          <p>To lower the barrier entry of new tube application, CM SHOULD accept to offer tubes of any
+            <tp:dbus-ref
+              namespace="org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT">Service</tp:dbus-ref> or
+            <tp:dbus-ref
+              namespace="org.freedesktop.Telepathy.Channel.Type.DBusTube.DRAFT">ServiceName</tp:dbus-ref>
+            if the contact announced to support tubes.</p>
+        </tp:rationale>
     </tp:docstring>
 
     <property name="Parameters" type="a{sv}" tp:type="String_Variant_Map"
-              access="readwrite" tp:name-for-bindings="Parameters">
+              access="read" tp:name-for-bindings="Parameters">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Each tube has a dictionary of arbitrary parameters. Parameters are
           commonly used to bootstrap legacy protocols where you can't
@@ -58,21 +77,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           SRV (RFC 2782) Service Types
           http://www.dns-sd.org/ServiceTypes.html</a>):
           <code>{'u': 'username', 'p': 'password', 'path': 'path'}</code></p>
-        <p>When requesting a channel with 
+        <p>When requesting a channel with
           <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>,
-          this property MAY be included in the request. If it is not included in
-          the request, the connection manager MUST consider the property to be
-          empty. This property MAY be changed after the channel creation when
-          the tube is in the state Not_Offered. If the tube is in another
-          state, changing this property MUST fail without side effects.</p>
+          this property MUST NOT be included in the request. This property is undefined until the tube is offered
+          (using <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT">OfferStreamTube</tp:dbus-ref>
+          or <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type.DBusTube.DRAFT">OfferDBusTube</tp:dbus-ref>).
+          Once it has been offered, this property MUST NOT change.</p>
+        <p>When receiving an incoming tube, this property is immutable and so advertised in the
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.NewChannels</tp:dbus-ref>
+          signal.</p>
       </tp:docstring>
     </property>
 
-    <property name="Status" type="u" tp:type="Tube_Channel_State" access="read"
-              tp:name-for-bindings="Status">
+    <property name="State" type="u" tp:type="Tube_Channel_State" access="read"
+              tp:name-for-bindings="State">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Status of the tube in this channel.</p>
-        <p>When requesting a channel with 
+        <p>State of the tube in this channel.</p>
+        <p>When requesting a channel with
           <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>,
           this property MUST NOT be included in the request.</p>
       </tp:docstring>
diff --git a/extensions/Channel_Type_DBus_Tube.xml b/extensions/Channel_Type_DBus_Tube.xml
index a3b98d7e..06a899dc 100644
--- a/extensions/Channel_Type_DBus_Tube.xml
+++ b/extensions/Channel_Type_DBus_Tube.xml
@@ -58,6 +58,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       <tp:docstring>
         Offers a D-Bus tube providing the service specified.
       </tp:docstring>
+      <arg direction="in" name="parameters" type="a{sv}"
+        tp:type="String_Variant_Map">
+        <tp:docstring>
+          The dictionary of arbitrary
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT">Parameters</tp:dbus-ref>
+          to send with the tube offer.
+        </tp:docstring>
+      </arg>
+      <arg direction="out" name="address" type="s">
+        <tp:docstring>
+          The string describing the address of the private bus. The client
+          SHOULD not attempt to connect to the address until the tube is open.
+        </tp:docstring>
+      </arg>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
@@ -66,11 +80,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             capabilities.
           </tp:docstring>
         </tp:error>
-        <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented">
-          <tp:docstring>
-            The connection manager doesn't support D-Bus tubes.
-          </tp:docstring>
-        </tp:error>
       </tp:possible-errors>
     </method>
 
@@ -87,71 +96,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           SHOULD not attempt to connect to the address until the tube is open.
         </tp:docstring>
       </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
-          <tp:docstring>
-            The given tube ID is invalid or does not refer to a D-Bus
-            tube.
-          </tp:docstring>
-        </tp:error>
-      </tp:possible-errors>
-    </method>
-
-    <method name="GetDBusTubeAddress"
-            tp:name-for-bindings="Get_DBus_Tube_Address">
-      <tp:docstring>
-        Return a string describing the address of the private bus.
-      </tp:docstring>
-      <arg direction="out" type="s">
-        <tp:docstring>
-          The bus address.
-        </tp:docstring>
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
-          <tp:docstring>
-            The tube is not a D-Bus tube.
-          </tp:docstring>
-        </tp:error>
-        <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
-          <tp:docstring>
-            This tube is not in the "open" state.
-          </tp:docstring>
-        </tp:error>
-      </tp:possible-errors>
-    </method>
-
-    <method name="GetDBusNames" tp:name-for-bindings="Get_DBus_Names">
-      <tp:docstring>
-        For a multi-user (i.e. Handle_Type_Room) D-Bus tube, obtain a mapping
-        between contact handles and their unique bus names on this tube.
-      </tp:docstring>
-      <arg direction="out" type="a(us)" tp:type="DBus_Tube_Member[]">
-        <tp:docstring>
-          An array of structures, each containing a contact handle and a D-Bus
-          bus name.
-        </tp:docstring>
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
-          <tp:docstring>
-            The tube is not a multi-user D-Bus tube.
-          </tp:docstring>
-        </tp:error>
-        <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
-          <tp:docstring>
-            This tube is not in the "open" state.
-          </tp:docstring>
-        </tp:error>
-      </tp:possible-errors>
     </method>
 
     <signal name="DBusNamesChanged" tp:name-for-bindings="DBus_Names_Changed">
       <tp:docstring>
         Emitted on a multi-user (i.e. Handle_Type_Room) D-Bus tube when a
-        participant opens or closes the tube.
+        participant opens or closes the tube.  This provides change
+        notification for the <tp:member-ref>DBusNames</tp:member-ref> property.
       </tp:docstring>
-      <arg name="added" type="a(us)" tp:type="DBus_Tube_Member[]">
+      <arg name="added" type="a{us}" tp:type="DBus_Tube_Participants">
         <tp:docstring>
           Array of handles and D-Bus names of new participants.
         </tp:docstring>
@@ -171,12 +124,39 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           com.example.ServiceName.</p>
         <p>When the tube is offered, the service name is transmitted to the
           other end.</p>
-        <p>When requesting a channel with 
+        <p>When requesting a channel with
           <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>,
           this property MUST be included in the request.</p>
       </tp:docstring>
     </property>
 
+    <property name="DBusNames" tp:name-for-bindings="DBus_Names"
+      access="read" type="a{us}" tp:type="DBus_Tube_Participants">
+      <tp:docstring>
+        For a multi-user (i.e. Handle_Type_Room) D-Bus tube, a mapping
+        between contact handles and their unique bus names on this tube.
+        For a peer-to-peer (i.e. Handle_Type_Contact) D-Bus tube, the empty
+        dictionary.  Change notification is via
+        <tp:member-ref>DBusNamesChanged</tp:member-ref>.
+      </tp:docstring>
+    </property>
+
+    <tp:mapping name="DBus_Tube_Participants">
+      <tp:docstring>Represents the participants in a multi-user D-Bus tube, as
+        used by the <tp:member-ref>DBusNames</tp:member-ref> property and the
+        <tp:member-ref>DBusNamesChanged</tp:member-ref> signal.</tp:docstring>
+      <tp:member type="u" tp:type="Contact_Handle" name="Handle">
+        <tp:docstring>
+          The handle of a participant in this D-Bus tube.
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="s" tp:type="DBus_Unique_Name" name="Unique_Name">
+        <tp:docstring>
+          That participant's unique name.
+        </tp:docstring>
+      </tp:member>
+    </tp:mapping>
+
   </interface>
 
 </node>
diff --git a/extensions/Channel_Type_Stream_Tube.xml b/extensions/Channel_Type_Stream_Tube.xml
index 4a43a007..1c721d07 100644
--- a/extensions/Channel_Type_Stream_Tube.xml
+++ b/extensions/Channel_Type_Stream_Tube.xml
@@ -66,6 +66,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           specified in the documentation for the Socket_Access_Control enum.
         </tp:docstring>
       </arg>
+      <arg direction="in" name="parameters" type="a{sv}"
+        tp:type="String_Variant_Map">
+        <tp:docstring>
+          The dictionary of arbitrary
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT">Parameters</tp:dbus-ref>
+          to send with the tube offer.
+        </tp:docstring>
+      </arg>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
@@ -154,7 +162,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           "rsync" or "daap".</p>
         <p>When the tube is offered, the service name is transmitted to the
           other end.</p>
-        <p>When requesting a channel with 
+        <p>When requesting a channel with
           <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>,
           this property MUST be included in the request.</p>
       </tp:docstring>
@@ -185,7 +193,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <p>Connection Managers MUST support at least IPv4 with the localhost
           access control.</p>
 
-        <p>When requesting a channel with 
+        <p>When requesting a channel with
           <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>,
           this property MUST NOT be included in the request.</p>
 
diff --git a/extensions/all.xml b/extensions/all.xml
index fbc3b239..0485d36f 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -56,6 +56,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
     from="Telepathy specification"/>
   <tp:external-type name="Supported_Socket_Map" type="a{uau}"
     from="Telepathy specification"/>
+  <tp:external-type name="Unix_Timestamp64" type="t"
+    from="Telepathy specification"/>
+  <tp:simple-type name="DBus_Unique_Name" type="s"
+    from="Telepathy specification"/>
 </tp:generic-types>
 
 </tp:spec>
diff --git a/lib/gibber/AUTHORS b/lib/gibber/AUTHORS
new file mode 100644
index 00000000..93b800c1
--- /dev/null
+++ b/lib/gibber/AUTHORS
@@ -0,0 +1 @@
+Sjoerd Simons <sjoerd@luon.net>
diff --git a/lib/gibber/COPYING b/lib/gibber/COPYING
new file mode 100644
index 00000000..e3819249
--- /dev/null
+++ b/lib/gibber/COPYING
@@ -0,0 +1,542 @@
+Most of Salut is licensed under the GNU Lesser General Public License,
+as published by the Free Software Foundation and reproduced below:
+either version 2.1 of the License, or (at your option) any later version.
+
+xep.xsl in the the tools/ directory, used to generate HTML documentation
+for the Clique protocol, is copyright 1999-2008 by the
+XMPP Standards Foundation (XSF) and is released under a MIT-style
+license, reproduced below.
+
+------------------------------------------------------------------------
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs must
+be allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at least
+    three years, to give the same user the materials specified in
+    Subsection 6a, above, for a charge no more than the cost of
+    performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+------------------------------------------------------------------------
+
+License of tools/xep.xsl:
+
+  Copyright (c) 1999 - 2008 XMPP Standards Foundation
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am
index 975e8d33..f324db10 100644
--- a/lib/gibber/Makefile.am
+++ b/lib/gibber/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=examples
+SUBDIRS = examples tests
 
 noinst_LTLIBRARIES = libgibber.la
 
diff --git a/lib/gibber/tests/Makefile.am b/lib/gibber/tests/Makefile.am
new file mode 100644
index 00000000..cc137228
--- /dev/null
+++ b/lib/gibber/tests/Makefile.am
@@ -0,0 +1,122 @@
+CLEANFILES=
+
+include $(top_srcdir)/rules/check.mak
+
+SUPPRESSIONS=valgrind.supp dlopen.supp
+
+# Teach it how to make libgibber.la
+$(top_builddir)/lib/gibber/libgibber.la:
+	${MAKE} -C $(top_builddir)/lib/gibber libgibber.la
+
+.PHONY: $(top_builddir)/lib/gibber/libgibber.la
+
+TESTS = \
+	run-xmpp-connection-test.sh
+
+check_PROGRAMS = \
+	test-xmpp-connection    \
+	test-r-multicast-transport-io
+
+check_SCRIPTS = run-xmpp-connection-test.sh
+
+EXTRA_DIST = simplemeshtest.py mesh.py $(check_SCRIPTS)
+
+test_xmpp_connection_SOURCES = \
+    test-xmpp-connection.c     \
+    test-transport.c           \
+    test-transport.h
+
+test_xmpp_connection_LDADD = \
+    $(top_builddir)/lib/gibber/libgibber.la \
+    $(AM_LDFLAGS)
+
+test_xmpp_connection_CFLAGS = \
+    $(AM_CFLAGS)
+
+test_r_multicast_transport_io_SOURCES = \
+    test-r-multicast-transport-io.c     \
+    test-transport.c           \
+    test-transport.h
+
+test_r_multicast_transport_io_LDADD = \
+    $(top_builddir)/lib/gibber/libgibber.la \
+    $(AM_LDFLAGS)
+
+test_r_multicast_transport_io_CFLAGS = \
+    $(AM_CFLAGS)
+
+
+if HAVE_CHECK
+check_PROGRAMS += check-main
+TESTS += check-main
+check_main_SOURCES =                             \
+    check-main.c                                 \
+    check-helpers.c                              \
+    check-helpers.h                              \
+    check-gibber.h                               \
+    check-gibber-xmpp-node.c                     \
+    check-gibber-xmpp-reader.c                   \
+    check-gibber-r-multicast-causal-transport.c  \
+    check-gibber-resolver.c                      \
+    test-resolver.c                              \
+    test-resolver.h                              \
+    test-transport.c                             \
+    test-transport.h                             \
+    check-gibber-xmpp-connection.c               \
+    check-gibber-r-multicast-packet.c            \
+    check-gibber-r-multicast-sender.c            \
+    check-gibber-xmpp-stanza.c                   \
+    check-gibber-iq-helper.c                     \
+    check-gibber-listener.c                      \
+    check-gibber-xmpp-connection-listener.c      \
+    check-gibber-xmpp-error.c
+
+check_main_LDADD = \
+    @CHECK_LIBS@ \
+    $(top_builddir)/lib/gibber/libgibber.la \
+    $(AM_LDFLAGS)
+
+check_main_CFLAGS = \
+    @CHECK_CFLAGS@ \
+    $(AM_CFLAGS)
+
+if HAVE_LIBSASL2
+  check_main_SOURCES += \
+      check-gibber-sasl-auth.c   \
+      test-sasl-auth-server.c    \
+      test-sasl-auth-server.h
+
+  check_main_LDADD += @LIBSASL2_LIBS@
+  check_main_CFLAGS += @LIBSASL2_CFLAGS@
+endif
+
+endif
+
+AM_CFLAGS = $(ERROR_CFLAGS) @GLIB_CFLAGS@ @LIBXML2_CFLAGS@ @DBUS_CFLAGS@ \
+    -I $(top_srcdir) -I $(top_builddir) \
+    -I $(top_srcdir)/lib -I $(top_builddir)/lib
+
+AM_LDFLAGS = @GLIB_LIBS@
+
+# Coding style checks
+check_c_sources = \
+    $(test_xmpp_connection_SOURCES) \
+    $(test_r_multicast_transport_io_SOURCES)
+
+if HAVE_CHECK
+    check_c_sources += $(check_main_SOURCES)
+endif
+
+include $(top_srcdir)/tools/check-coding-style.mk
+check-local: check-coding-style
+
+clean-local:
+	-rm -rf outputs
+	-rm -f sasl-test.db
+
+SUBDIRS = inputs
+
+$(check_SCRIPTS): always-run
+	chmod +x $(srcdir)/$@
+
+.PHONY: always-run
diff --git a/tests/check-gibber-iq-helper.c b/lib/gibber/tests/check-gibber-iq-helper.c
index 5a79c452..5a79c452 100644
--- a/tests/check-gibber-iq-helper.c
+++ b/lib/gibber/tests/check-gibber-iq-helper.c
diff --git a/tests/check-gibber-listener.c b/lib/gibber/tests/check-gibber-listener.c
index 4a1bce06..4a1bce06 100644
--- a/tests/check-gibber-listener.c
+++ b/lib/gibber/tests/check-gibber-listener.c
diff --git a/tests/check-gibber-r-multicast-causal-transport.c b/lib/gibber/tests/check-gibber-r-multicast-causal-transport.c
index 8dc92782..8dc92782 100644
--- a/tests/check-gibber-r-multicast-causal-transport.c
+++ b/lib/gibber/tests/check-gibber-r-multicast-causal-transport.c
diff --git a/tests/check-gibber-r-multicast-packet.c b/lib/gibber/tests/check-gibber-r-multicast-packet.c
index 52bfef41..52bfef41 100644
--- a/tests/check-gibber-r-multicast-packet.c
+++ b/lib/gibber/tests/check-gibber-r-multicast-packet.c
diff --git a/tests/check-gibber-r-multicast-sender.c b/lib/gibber/tests/check-gibber-r-multicast-sender.c
index b0a4c903..b0a4c903 100644
--- a/tests/check-gibber-r-multicast-sender.c
+++ b/lib/gibber/tests/check-gibber-r-multicast-sender.c
diff --git a/tests/check-gibber-resolver.c b/lib/gibber/tests/check-gibber-resolver.c
index ba6effa0..ba6effa0 100644
--- a/tests/check-gibber-resolver.c
+++ b/lib/gibber/tests/check-gibber-resolver.c
diff --git a/tests/check-gibber-sasl-auth.c b/lib/gibber/tests/check-gibber-sasl-auth.c
index 4ce68ff3..4ce68ff3 100644
--- a/tests/check-gibber-sasl-auth.c
+++ b/lib/gibber/tests/check-gibber-sasl-auth.c
diff --git a/tests/check-gibber-xmpp-connection-listener.c b/lib/gibber/tests/check-gibber-xmpp-connection-listener.c
index 8dd19314..8dd19314 100644
--- a/tests/check-gibber-xmpp-connection-listener.c
+++ b/lib/gibber/tests/check-gibber-xmpp-connection-listener.c
diff --git a/tests/check-gibber-xmpp-connection.c b/lib/gibber/tests/check-gibber-xmpp-connection.c
index de9dd1da..de9dd1da 100644
--- a/tests/check-gibber-xmpp-connection.c
+++ b/lib/gibber/tests/check-gibber-xmpp-connection.c
diff --git a/tests/check-gibber-xmpp-error.c b/lib/gibber/tests/check-gibber-xmpp-error.c
index 3acc61c7..3acc61c7 100644
--- a/tests/check-gibber-xmpp-error.c
+++ b/lib/gibber/tests/check-gibber-xmpp-error.c
diff --git a/tests/check-gibber-xmpp-node.c b/lib/gibber/tests/check-gibber-xmpp-node.c
index 3f5ea32c..3f5ea32c 100644
--- a/tests/check-gibber-xmpp-node.c
+++ b/lib/gibber/tests/check-gibber-xmpp-node.c
diff --git a/tests/check-gibber-xmpp-reader.c b/lib/gibber/tests/check-gibber-xmpp-reader.c
index d6bb8b04..d6bb8b04 100644
--- a/tests/check-gibber-xmpp-reader.c
+++ b/lib/gibber/tests/check-gibber-xmpp-reader.c
diff --git a/tests/check-gibber-xmpp-stanza.c b/lib/gibber/tests/check-gibber-xmpp-stanza.c
index ab0e62d4..ab0e62d4 100644
--- a/tests/check-gibber-xmpp-stanza.c
+++ b/lib/gibber/tests/check-gibber-xmpp-stanza.c
diff --git a/tests/check-gibber.h b/lib/gibber/tests/check-gibber.h
index edd747ff..edd747ff 100644
--- a/tests/check-gibber.h
+++ b/lib/gibber/tests/check-gibber.h
diff --git a/lib/gibber/tests/check-helpers.c b/lib/gibber/tests/check-helpers.c
new file mode 100644
index 00000000..86ef1154
--- /dev/null
+++ b/lib/gibber/tests/check-helpers.c
@@ -0,0 +1,63 @@
+/*
+ * check-helpers.c - Source for some check helpers
+ * Copyright (C) 2007 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "check-helpers.h"
+
+static gboolean expecting_critical = FALSE;
+static gboolean received_critical  = FALSE;
+
+static void
+check_helper_log_critical_func (const gchar *log_damain,
+                                GLogLevelFlags log_level,
+                                const gchar *message,
+                                gpointer user_data)
+{
+
+  if (!expecting_critical)
+    {
+      fail ("Unexpected critical message: %s\n", message);
+    }
+
+  g_assert (log_level & G_LOG_LEVEL_CRITICAL);
+
+  received_critical = TRUE;
+}
+
+gboolean
+got_critical (void)
+{
+  return received_critical;
+}
+
+void
+expect_critical (gboolean expected)
+{
+  expecting_critical = expected;
+  received_critical = FALSE;
+}
+
+void
+check_helpers_init (void)
+{
+  g_log_set_handler (NULL, G_LOG_LEVEL_CRITICAL,
+      check_helper_log_critical_func, NULL);
+}
diff --git a/lib/gibber/tests/check-helpers.h b/lib/gibber/tests/check-helpers.h
new file mode 100644
index 00000000..b71b3b65
--- /dev/null
+++ b/lib/gibber/tests/check-helpers.h
@@ -0,0 +1,43 @@
+/*
+ * check-helpers.c - Source for some check helpers
+ * Copyright (C) 2007 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#ifndef __CHECK_HELPERS_H__
+#define __CHECK_HELPERS_H__
+
+#include <glib.h>
+#include <check.h>
+
+void
+check_helpers_init (void);
+
+void
+expect_critical (gboolean expected);
+
+gboolean
+got_critical (void);
+
+#define fail_unless_critical(expr, ...)                          \
+G_STMT_START {                                                    \
+  expect_critical (TRUE);                                         \
+  expr;                                                           \
+  _fail_unless (got_critical (), __FILE__, __LINE__,              \
+      "Expected g_critical, got none", ## __VA_ARGS__, NULL);     \
+  expect_critical (FALSE);                                        \
+} G_STMT_END;
+
+#endif /* #ifndef __CHECK_HELPERS_H__ */
diff --git a/lib/gibber/tests/check-main.c b/lib/gibber/tests/check-main.c
new file mode 100644
index 00000000..cf01cfe4
--- /dev/null
+++ b/lib/gibber/tests/check-main.c
@@ -0,0 +1,54 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <glib-object.h>
+
+#include <check.h>
+
+#include "check-gibber.h"
+#include "check-helpers.h"
+
+#include "config.h"
+
+static Suite *
+make_gibber_suite (void)
+{
+    Suite *s = suite_create ("Gibber");
+
+    suite_add_tcase (s, make_gibber_xmpp_node_tcase ());
+    suite_add_tcase (s, make_gibber_xmpp_reader_tcase ());
+    suite_add_tcase (s, make_gibber_xmpp_connection_tcase ());
+#ifdef HAVE_LIBSASL2
+    suite_add_tcase (s, make_gibber_sasl_auth_tcase ());
+#endif
+    suite_add_tcase (s, make_gibber_resolver_tcase ());
+    suite_add_tcase (s, make_gibber_r_multicast_packet_tcase ());
+    suite_add_tcase (s, make_gibber_r_multicast_sender_tcase ());
+    suite_add_tcase (s, make_gibber_r_multicast_causal_transport_tcase ());
+    suite_add_tcase (s, make_gibber_xmpp_stanza_tcase ());
+    suite_add_tcase (s, make_gibber_iq_helper_tcase ());
+    suite_add_tcase (s, make_gibber_listener_tcase ());
+    suite_add_tcase (s, make_gibber_xmpp_connection_listener_tcase ());
+    suite_add_tcase (s, make_gibber_xmpp_error_tcase ());
+
+    return s;
+}
+
+int
+main (void)
+{
+    int number_failed = 0;
+    Suite *s;
+    SRunner *sr;
+
+    check_helpers_init ();
+    g_type_init ();
+
+    s = make_gibber_suite ();
+    sr = srunner_create (s);
+    srunner_run_all (sr, CK_NORMAL);
+    number_failed += srunner_ntests_failed (sr);
+    srunner_free (sr);
+
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/inputs/Makefile.am b/lib/gibber/tests/inputs/Makefile.am
index 0b8b19f3..0b8b19f3 100644
--- a/tests/inputs/Makefile.am
+++ b/lib/gibber/tests/inputs/Makefile.am
diff --git a/tests/inputs/groupchat-invite.input b/lib/gibber/tests/inputs/groupchat-invite.input
index 3c7954f4..3c7954f4 100644
--- a/tests/inputs/groupchat-invite.input
+++ b/lib/gibber/tests/inputs/groupchat-invite.input
diff --git a/tests/inputs/simple-message-attrnamespace.input b/lib/gibber/tests/inputs/simple-message-attrnamespace.input
index b85d92f6..b85d92f6 100644
--- a/tests/inputs/simple-message-attrnamespace.input
+++ b/lib/gibber/tests/inputs/simple-message-attrnamespace.input
diff --git a/tests/inputs/simple-message.input b/lib/gibber/tests/inputs/simple-message.input
index a3989ae5..a3989ae5 100644
--- a/tests/inputs/simple-message.input
+++ b/lib/gibber/tests/inputs/simple-message.input
diff --git a/tests/inputs/strange-streamopening.input b/lib/gibber/tests/inputs/strange-streamopening.input
index 4685541a..4685541a 100644
--- a/tests/inputs/strange-streamopening.input
+++ b/lib/gibber/tests/inputs/strange-streamopening.input
diff --git a/tests/inputs/tls-stream-start.input b/lib/gibber/tests/inputs/tls-stream-start.input
index d30bcf88..d30bcf88 100644
--- a/tests/inputs/tls-stream-start.input
+++ b/lib/gibber/tests/inputs/tls-stream-start.input
diff --git a/tests/run-xmpp-connection-test.sh b/lib/gibber/tests/run-xmpp-connection-test.sh
index e2337abc..e2337abc 100755
--- a/tests/run-xmpp-connection-test.sh
+++ b/lib/gibber/tests/run-xmpp-connection-test.sh
diff --git a/tests/test-r-multicast-transport-io.c b/lib/gibber/tests/test-r-multicast-transport-io.c
index 62a4e96d..62a4e96d 100644
--- a/tests/test-r-multicast-transport-io.c
+++ b/lib/gibber/tests/test-r-multicast-transport-io.c
diff --git a/tests/test-resolver.c b/lib/gibber/tests/test-resolver.c
index bb6ab8d7..bb6ab8d7 100644
--- a/tests/test-resolver.c
+++ b/lib/gibber/tests/test-resolver.c
diff --git a/tests/test-resolver.h b/lib/gibber/tests/test-resolver.h
index 1d39e4e6..1d39e4e6 100644
--- a/tests/test-resolver.h
+++ b/lib/gibber/tests/test-resolver.h
diff --git a/tests/test-sasl-auth-server-signals-marshal.list b/lib/gibber/tests/test-sasl-auth-server-signals-marshal.list
index e69de29b..e69de29b 100644
--- a/tests/test-sasl-auth-server-signals-marshal.list
+++ b/lib/gibber/tests/test-sasl-auth-server-signals-marshal.list
diff --git a/tests/test-sasl-auth-server.c b/lib/gibber/tests/test-sasl-auth-server.c
index 7132122e..7132122e 100644
--- a/tests/test-sasl-auth-server.c
+++ b/lib/gibber/tests/test-sasl-auth-server.c
diff --git a/tests/test-sasl-auth-server.h b/lib/gibber/tests/test-sasl-auth-server.h
index cbfe95ea..cbfe95ea 100644
--- a/tests/test-sasl-auth-server.h
+++ b/lib/gibber/tests/test-sasl-auth-server.h
diff --git a/tests/test-transport.c b/lib/gibber/tests/test-transport.c
index 78bd5660..78bd5660 100644
--- a/tests/test-transport.c
+++ b/lib/gibber/tests/test-transport.c
diff --git a/tests/test-transport.h b/lib/gibber/tests/test-transport.h
index 1e76d133..1e76d133 100644
--- a/tests/test-transport.h
+++ b/lib/gibber/tests/test-transport.h
diff --git a/tests/test-xmpp-connection.c b/lib/gibber/tests/test-xmpp-connection.c
index 71e5e2b1..71e5e2b1 100644
--- a/tests/test-xmpp-connection.c
+++ b/lib/gibber/tests/test-xmpp-connection.c
diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index 06cca41c..6dae2003 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -983,13 +983,13 @@ generate_tube_id (void)
 SalutTubeIface *
 salut_tubes_channel_tube_request (SalutTubesChannel *self,
                                   const gchar *channel_type,
-                                  const gchar *service,
-                                  GHashTable *parameters)
+                                  const gchar *service)
 {
   SalutTubesChannelPrivate *priv = SALUT_TUBES_CHANNEL_GET_PRIVATE (self);
   SalutTubeIface *tube;
   guint tube_id;
   TpTubeType type;
+  GHashTable *parameters;
 
   tube_id = generate_tube_id ();
 
@@ -1007,14 +1007,6 @@ salut_tubes_channel_tube_request (SalutTubesChannel *self,
   else
     g_assert_not_reached ();
 
-  if (parameters == NULL)
-    {
-      /* If it is not included in the request, the connection manager MUST
-       * consider the property to be empty. */
-      parameters = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-          (GDestroyNotify) tp_g_value_slice_free);
-    }
-
   /* if the service property is missing, the requestotron rejects the request
    */
   g_assert (service != NULL);
@@ -1022,9 +1014,14 @@ salut_tubes_channel_tube_request (SalutTubesChannel *self,
   DEBUG ("Request a tube channel with type='%s' and service='%s'",
       channel_type, service);
 
+  /* requested tubes have an empty parameters dict */
+  parameters = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+          (GDestroyNotify) tp_g_value_slice_free);
+
   tube = create_new_tube (self, type, priv->self_handle, FALSE, service,
       parameters, tube_id, 0, NULL);
 
+  g_hash_table_destroy (parameters);
   return tube;
 }
 
diff --git a/src/salut-tubes-channel.h b/src/salut-tubes-channel.h
index e463caf4..7b97007b 100644
--- a/src/salut-tubes-channel.h
+++ b/src/salut-tubes-channel.h
@@ -86,7 +86,7 @@ void salut_tubes_channel_message_close_received (SalutTubesChannel *self,
     TpHandle initiator_handle, guint tube_id);
 
 SalutTubeIface *salut_tubes_channel_tube_request (SalutTubesChannel *self,
-    const gchar *channel_type, const gchar *service, GHashTable *parameters);
+    const gchar *channel_type, const gchar *service);
 
 void salut_tubes_channel_send_iq_offer (SalutTubesChannel *self);
 
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index a0e075d7..1cb66362 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -797,7 +797,6 @@ static const gchar * const old_tubes_channel_allowed_properties[] = {
 };
 static const gchar * const stream_tube_channel_allowed_properties[] = {
     TP_IFACE_CHANNEL ".TargetHandle",
-    SALUT_IFACE_CHANNEL_INTERFACE_TUBE ".Parameters",
     SALUT_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service",
     NULL
 };
@@ -805,7 +804,6 @@ static const gchar * const stream_tube_channel_allowed_properties[] = {
 #if 0
 static const gchar * const dbus_tube_channel_allowed_properties[] = {
     TP_IFACE_CHANNEL ".TargetHandle",
-    SALUT_IFACE_CHANNEL_INTERFACE_TUBE ".Parameters",
     SALUT_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName",
     NULL
 };
@@ -1015,7 +1013,6 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
     {
       SalutTubeIface *new_channel;
       GSList *tokens = NULL;
-      GHashTable *parameters;
 
       if (tubes_channel == NULL)
         {
@@ -1025,12 +1022,8 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
             goto error;
         }
 
-      parameters = tp_asv_get_boxed (request_properties,
-          SALUT_IFACE_CHANNEL_INTERFACE_TUBE ".Parameters",
-          TP_HASH_TYPE_STRING_VARIANT_MAP);
-
       new_channel = salut_tubes_channel_tube_request (tubes_channel,
-          channel_type, service, parameters);
+          channel_type, service);
       g_assert (new_channel != NULL);
 
       if (request_token != NULL)
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 76f83de6..32783058 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -1087,19 +1087,41 @@ salut_tube_stream_get_property (GObject *object,
         g_value_set_boolean (value, priv->closed);
         break;
       case PROP_CHANNEL_PROPERTIES:
-        g_value_take_boxed (value,
-            tp_dbus_properties_mixin_make_properties_hash (object,
-                TP_IFACE_CHANNEL, "TargetHandle",
-                TP_IFACE_CHANNEL, "TargetHandleType",
-                TP_IFACE_CHANNEL, "ChannelType",
-                TP_IFACE_CHANNEL, "TargetID",
-                TP_IFACE_CHANNEL, "InitiatorHandle",
-                TP_IFACE_CHANNEL, "InitiatorID",
-                TP_IFACE_CHANNEL, "Requested",
-                TP_IFACE_CHANNEL, "Interfaces",
-                SALUT_IFACE_CHANNEL_TYPE_STREAM_TUBE, "Service",
-                SALUT_IFACE_CHANNEL_TYPE_STREAM_TUBE, "SupportedSocketTypes",
-                NULL));
+        {
+          GHashTable *properties;
+
+          properties = tp_dbus_properties_mixin_make_properties_hash (object,
+              TP_IFACE_CHANNEL, "TargetHandle",
+              TP_IFACE_CHANNEL, "TargetHandleType",
+              TP_IFACE_CHANNEL, "ChannelType",
+              TP_IFACE_CHANNEL, "TargetID",
+              TP_IFACE_CHANNEL, "InitiatorHandle",
+              TP_IFACE_CHANNEL, "InitiatorID",
+              TP_IFACE_CHANNEL, "Requested",
+              TP_IFACE_CHANNEL, "Interfaces",
+              SALUT_IFACE_CHANNEL_TYPE_STREAM_TUBE, "Service",
+              SALUT_IFACE_CHANNEL_TYPE_STREAM_TUBE, "SupportedSocketTypes",
+              NULL);
+
+          if (priv->initiator != priv->self_handle)
+            {
+              /* channel has not been requested so Parameters is immutable */
+              GValue *prop_value = g_slice_new0 (GValue);
+
+              /* FIXME: use tp_dbus_properties_mixin_add_properties once it's
+               * added in tp-glib */
+              tp_dbus_properties_mixin_get (object,
+                  SALUT_IFACE_CHANNEL_INTERFACE_TUBE, "Parameters",
+                  prop_value, NULL);
+              g_assert (G_IS_VALUE (prop_value));
+
+              g_hash_table_insert (properties,
+                  g_strdup_printf ("%s.%s", SALUT_IFACE_CHANNEL_INTERFACE_TUBE,
+                    "Parameters"), prop_value);
+            }
+
+          g_value_take_boxed (value, properties);
+        }
         break;
       case PROP_REQUESTED:
         g_value_set_boolean (value,
@@ -1379,41 +1401,6 @@ salut_tube_stream_constructor (GType type,
   return obj;
 }
 
-static gboolean
-tube_iface_props_setter (GObject *object,
-                         GQuark interface,
-                         GQuark name,
-                         const GValue *value,
-                         gpointer setter_data,
-                         GError **error)
-{
-  SalutTubeStream *self = SALUT_TUBE_STREAM (object);
-  SalutTubeStreamPrivate *priv = SALUT_TUBE_STREAM_GET_PRIVATE (self);
-
-  g_return_val_if_fail (interface == SALUT_IFACE_QUARK_CHANNEL_INTERFACE_TUBE,
-      FALSE);
-
-  if (name != g_quark_from_static_string ("Parameters"))
-    {
-      g_object_set_property (object, setter_data, value);
-      return TRUE;
-    }
-
-  if (priv->state != SALUT_TUBE_CHANNEL_STATE_NOT_OFFERED)
-    {
-      g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
-          "Can change parameters only if the tube is not offered");
-      return FALSE;
-    }
-
-  if (priv->parameters != NULL)
-    g_hash_table_destroy (priv->parameters);
-  priv->parameters = g_value_dup_boxed (value);
-
-  return TRUE;
-}
-
-
 static void
 salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
 {
@@ -1434,8 +1421,8 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
       { NULL }
   };
   static TpDBusPropertiesMixinPropImpl tube_iface_props[] = {
-      { "Parameters", "parameters", "parameters" },
-      { "Status", "state", NULL },
+      { "Parameters", "parameters", NULL },
+      { "State", "state", NULL },
       { NULL }
   };
   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
@@ -1451,7 +1438,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
       },
       { SALUT_IFACE_CHANNEL_INTERFACE_TUBE,
         tp_dbus_properties_mixin_getter_gobject_properties,
-        tube_iface_props_setter,
+        NULL,
         tube_iface_props,
       },
       { NULL }
@@ -2263,6 +2250,7 @@ salut_tube_stream_offer_stream_tube (SalutSvcChannelTypeStreamTube *iface,
                                      const GValue *address,
                                      guint access_control,
                                      const GValue *access_control_param,
+                                     GHashTable *parameters,
                                      DBusGMethodInvocation *context)
 {
   SalutTubeStream *self = SALUT_TUBE_STREAM (iface);
@@ -2302,6 +2290,8 @@ salut_tube_stream_offer_stream_tube (SalutSvcChannelTypeStreamTube *iface,
   g_assert (priv->access_control_param == NULL);
   priv->access_control_param = tp_g_value_slice_dup (access_control_param);
 
+  g_object_set (self, "parameters", parameters, NULL);
+
   if (priv->handle_type == TP_HANDLE_TYPE_CONTACT)
     {
       salut_tubes_channel_send_iq_offer (priv->tubes_channel);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 93cda48e..405e3b7a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,15 +10,6 @@ $(top_builddir)/lib/gibber/libgibber.la:
 
 .PHONY: $(top_builddir)/lib/gibber/libgibber.la
 
-TESTS = \
-	run-xmpp-connection-test.sh
-
-check_PROGRAMS = \
-	test-xmpp-connection    \
-	test-r-multicast-transport-io
-
-check_SCRIPTS = run-xmpp-connection-test.sh
-
 EXTRA_DIST = simplemeshtest.py mesh.py $(check_SCRIPTS)
 
 noinst_PROGRAMS = \
@@ -34,57 +25,15 @@ telepathy_salut_debug_LDADD = \
     $(top_builddir)/extensions/libsalut-extensions.la \
     -ltelepathy-glib
 
-test_xmpp_connection_SOURCES = \
-    test-xmpp-connection.c     \
-    test-transport.c           \
-    test-transport.h
-
-test_xmpp_connection_LDADD = \
-    $(top_builddir)/lib/gibber/libgibber.la \
-    $(AM_LDFLAGS)
-
-test_xmpp_connection_CFLAGS = \
-    $(AM_CFLAGS)
-
-test_r_multicast_transport_io_SOURCES = \
-    test-r-multicast-transport-io.c     \
-    test-transport.c           \
-    test-transport.h
-
-test_r_multicast_transport_io_LDADD = \
-    $(top_builddir)/lib/gibber/libgibber.la \
-    $(AM_LDFLAGS)
-
-test_r_multicast_transport_io_CFLAGS = \
-    $(AM_CFLAGS)
-
-
 if HAVE_CHECK
-check_PROGRAMS += check-main
-TESTS += check-main
+check_PROGRAMS = check-main
+TESTS = check-main
 check_main_SOURCES =                             \
     check-main.c                                 \
     check-helpers.c                              \
     check-helpers.h                              \
-    check-gibber.h                               \
-    check-salut.h                                \
-    check-gibber-xmpp-node.c                     \
-    check-gibber-xmpp-reader.c                   \
     check-node-properties.c                      \
-    check-gibber-r-multicast-causal-transport.c  \
-    check-gibber-resolver.c                      \
-    test-resolver.c                              \
-    test-resolver.h                              \
-    test-transport.c                             \
-    test-transport.h                             \
-    check-gibber-xmpp-connection.c               \
-    check-gibber-r-multicast-packet.c            \
-    check-gibber-r-multicast-sender.c            \
-    check-gibber-xmpp-stanza.c                   \
-    check-gibber-iq-helper.c                     \
-    check-gibber-listener.c                      \
-    check-gibber-xmpp-connection-listener.c      \
-    check-gibber-xmpp-error.c
+    check-salut.h
 
 check_main_LDADD = \
     @CHECK_LIBS@ \
@@ -97,16 +46,6 @@ check_main_CFLAGS = \
     @CHECK_CFLAGS@ \
     $(AM_CFLAGS)
 
-if HAVE_LIBSASL2
-  check_main_SOURCES += \
-      check-gibber-sasl-auth.c   \
-      test-sasl-auth-server.c    \
-      test-sasl-auth-server.h
-
-  check_main_LDADD += @LIBSASL2_LIBS@
-  check_main_CFLAGS += @LIBSASL2_CFLAGS@
-endif
-
 endif
 
 AM_CFLAGS = $(ERROR_CFLAGS) @GLIB_CFLAGS@ @LIBXML2_CFLAGS@ @DBUS_CFLAGS@ \
@@ -130,11 +69,7 @@ endif
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-clean-local:
-	-rm -rf outputs
-	-rm -f sasl-test.db
-
-SUBDIRS = inputs twisted
+SUBDIRS = twisted
 
 $(check_SCRIPTS): always-run
 	chmod +x $(srcdir)/$@
diff --git a/tests/check-main.c b/tests/check-main.c
index 7df4f389..7d1a85f5 100644
--- a/tests/check-main.c
+++ b/tests/check-main.c
@@ -5,37 +5,12 @@
 
 #include <check.h>
 
-#include "check-gibber.h"
 #include "check-salut.h"
 #include "check-helpers.h"
 
 #include "config.h"
 
 static Suite *
-make_gibber_suite (void)
-{
-    Suite *s = suite_create ("Gibber");
-
-    suite_add_tcase (s, make_gibber_xmpp_node_tcase ());
-    suite_add_tcase (s, make_gibber_xmpp_reader_tcase ());
-    suite_add_tcase (s, make_gibber_xmpp_connection_tcase ());
-#ifdef HAVE_LIBSASL2
-    suite_add_tcase (s, make_gibber_sasl_auth_tcase ());
-#endif
-    suite_add_tcase (s, make_gibber_resolver_tcase ());
-    suite_add_tcase (s, make_gibber_r_multicast_packet_tcase ());
-    suite_add_tcase (s, make_gibber_r_multicast_sender_tcase ());
-    suite_add_tcase (s, make_gibber_r_multicast_causal_transport_tcase ());
-    suite_add_tcase (s, make_gibber_xmpp_stanza_tcase ());
-    suite_add_tcase (s, make_gibber_iq_helper_tcase ());
-    suite_add_tcase (s, make_gibber_listener_tcase ());
-    suite_add_tcase (s, make_gibber_xmpp_connection_listener_tcase ());
-    suite_add_tcase (s, make_gibber_xmpp_error_tcase ());
-
-    return s;
-}
-
-static Suite *
 make_salut_suite (void)
 {
     Suite *s = suite_create ("Salut");
@@ -55,12 +30,6 @@ main (void)
     check_helpers_init ();
     g_type_init ();
 
-    s = make_gibber_suite ();
-    sr = srunner_create (s);
-    srunner_run_all (sr, CK_NORMAL);
-    number_failed += srunner_ntests_failed (sr);
-    srunner_free (sr);
-
     s = make_salut_suite ();
     sr = srunner_create (s);
     srunner_run_all (sr, CK_NORMAL);
diff --git a/tests/twisted/avahi/test-tube.py b/tests/twisted/avahi/test-tube.py
index 66d7b92e..845590e6 100644
--- a/tests/twisted/avahi/test-tube.py
+++ b/tests/twisted/avahi/test-tube.py
@@ -62,7 +62,6 @@ def check_conn_properties(q, bus, conn, channel_list=None):
              'org.freedesktop.Telepathy.Channel.TargetHandleType': HT_CONTACT,
              },
              ['org.freedesktop.Telepathy.Channel.TargetHandle',
-              'org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT.Parameters',
               'org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT.Service',
              ]
             ) in properties.get('RequestableChannelClasses'),\
@@ -95,7 +94,7 @@ def check_channel_properties(q, bus, conn, channel, channel_type,
         tube_props = channel.GetAll(
                 'org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT',
                 dbus_interface='org.freedesktop.DBus.Properties')
-        assert tube_props['Status'] == state, tube_props['Status']
+        assert tube_props['State'] == state, tube_props['State']
         # no strict check but at least check the properties exist
         assert tube_props.has_key('Parameters')
 
@@ -273,9 +272,7 @@ def test(q, bus, conn):
              'org.freedesktop.Telepathy.Channel.TargetHandle':
                 handle,
              'org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT.Service':
-                "newecho",
-             'org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT.Parameters':
-                dbus.Dictionary({'foo': 'bar'}, signature='sv'),
+                "newecho"
             });
     ret, old_sig, new_sig = q.expect_many(
         EventPattern('dbus-return', method='CreateChannel'),
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index efc564fc..89c50362 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -30,7 +30,7 @@ NOT_IMPLEMENTED = ERRORS + '.NotImplemented'
 NOT_AVAILABLE = ERRORS + '.NotAvailable'
 
 TUBE_PARAMETERS = CHANNEL_IFACE_TUBE + '.Parameters'
-TUBE_STATUS = CHANNEL_IFACE_TUBE + '.Status'
+TUBE_STATE = CHANNEL_IFACE_TUBE + '.State'
 STREAM_TUBE_SERVICE = CHANNEL_TYPE_STREAM_TUBE + '.Service'
 
 TUBE_CHANNEL_STATE_LOCAL_PENDING = 0