[Telepathy-commits] [telepathy-gabble/master] src/tube-stream.c: tubes always have an initiator. Add an assertion if not.

Alban Crequy alban.crequy at collabora.co.uk
Mon Oct 27 10:57:52 PDT 2008


---
 src/tube-stream.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/tube-stream.c b/src/tube-stream.c
index 153f90f..3c7d599 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -1048,15 +1048,14 @@ gabble_tube_stream_get_property (GObject *object,
             (priv->initiator == priv->self_handle));
         break;
       case PROP_INITIATOR_ID:
-        if (priv->initiator == 0)
-          {
-            g_value_set_static_string (value, "");
-          }
-        else
           {
             TpHandleRepoIface *repo = tp_base_connection_get_handles (
                 base_conn, TP_HANDLE_TYPE_CONTACT);
 
+            /* some channel can have o.f.T.Channel.InitiatorHandle == 0 but
+             * tubes always have an initiator */
+            g_assert (priv->initiator != 0);
+
             g_value_set_string (value,
                 tp_handle_inspect (repo, priv->initiator));
           }
-- 
1.5.6.5




More information about the Telepathy-commits mailing list