diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-03 16:06:15 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-05 12:10:41 +0100 |
| commit | b0c0f85511656db0608ef4aa7412eee72b2d672a (patch) | |
| tree | 4604850dcf43fe88fae2d35fae5dabcf59753164 /src | |
| parent | a0ed7591eac1b6987c726191ced42b5f8fa11efa (diff) | |
Stop using handle qdata
The handles now live as long as the connection, so there's no point
in trying to bind to their lifetime; just keep a hash table.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=62840
Reviewed-by: Mikhail Zabaluev <mikhail.zabaluev@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sip-connection-helpers.c | 3 | ||||
| -rw-r--r-- | src/sip-connection.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/sip-connection-helpers.c b/src/sip-connection-helpers.c index e1294eb..74524f7 100644 --- a/src/sip-connection-helpers.c +++ b/src/sip-connection-helpers.c @@ -64,7 +64,8 @@ priv_sip_to_url_make (RakiaConnection *conn, { const url_t *url; - url = rakia_handle_inspect_uri (TP_BASE_CONNECTION (conn), contact); + url = rakia_base_connection_handle_to_uri ( + (RakiaBaseConnection *) conn, contact); return sip_to_create (home, (const url_string_t *) url); } diff --git a/src/sip-connection.c b/src/sip-connection.c index 02c9c3e..91b0e8e 100644 --- a/src/sip-connection.c +++ b/src/sip-connection.c @@ -1006,6 +1006,7 @@ rakia_connection_start_connecting (TpBaseConnection *base, GError **error) { RakiaConnection *self = RAKIA_CONNECTION (base); + RakiaBaseConnection *rbase = RAKIA_BASE_CONNECTION (self); RakiaConnectionPrivate *priv = RAKIA_CONNECTION_GET_PRIVATE (self); TpHandleRepoIface *contact_repo; const gchar *sip_address; @@ -1031,7 +1032,8 @@ rakia_connection_start_connecting (TpBaseConnection *base, DEBUG("self_handle = %d, sip_address = %s", base->self_handle, sip_address); - priv->account_url = rakia_handle_inspect_uri (base, base->self_handle); + priv->account_url = rakia_base_connection_handle_to_uri (rbase, + tp_base_connection_get_self_handle (base)); if (priv->account_url == NULL) { g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, @@ -1130,4 +1132,7 @@ rakia_connection_disconnected (TpBaseConnection *base) nua_handle_unref (priv->register_op); priv->register_op = NULL; } + + /* we know that RakiaBaseConnection does implement this */ + TP_BASE_CONNECTION_CLASS (rakia_connection_parent_class)->disconnected (base); } |