diff options
| author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-01 01:01:45 +0200 |
|---|---|---|
| committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-02 17:22:06 +0200 |
| commit | 992e42d3a785465675e98f799d8070da3a16aa38 (patch) | |
| tree | d7ffe04122835a300fba13ec2c34b6a3e08ca4ae | |
| parent | d5b2c6b85a513694e3be8ab31bdc2e9012c6ddb3 (diff) | |
sip-text-channel: use TpsipBaseConnection
| -rw-r--r-- | src/sip-text-channel.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/sip-text-channel.c b/src/sip-text-channel.c index aeb0209..71be195 100644 --- a/src/sip-text-channel.c +++ b/src/sip-text-channel.c @@ -39,9 +39,7 @@ #include <telepathy-glib/svc-generic.h> #include <tpsip/event-target.h> - -#include "sip-connection.h" -#include "sip-connection-helpers.h" +#include <tpsip/base-connection.h> #include <sofia-sip/sip_protos.h> #include <sofia-sip/sip_status.h> @@ -112,7 +110,7 @@ typedef struct _TpsipTextChannelPrivate TpsipTextChannelPrivate; struct _TpsipTextChannelPrivate { - TpsipConnection *conn; + TpsipBaseConnection *conn; gchar *object_path; TpHandle handle; TpHandle initiator; @@ -186,7 +184,7 @@ tpsip_text_channel_constructed (GObject *obj) g_assert (priv->initiator != 0); tp_handle_ref (contact_handles, priv->initiator); - tpsip_connection_connect_auth_handler (priv->conn, TPSIP_EVENT_TARGET (obj)); + tpsip_base_connection_add_auth_handler (priv->conn, TPSIP_EVENT_TARGET (obj)); g_signal_connect (obj, "nua-event::nua_r_message", @@ -271,7 +269,7 @@ tpsip_text_channel_class_init(TpsipTextChannelClass *klass) param_spec = g_param_spec_object("connection", "TpsipConnection object", "SIP connection object that owns this SIP media channel object.", - TPSIP_TYPE_CONNECTION, + TPSIP_TYPE_BASE_CONNECTION, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property(object_class, PROP_CONNECTION, param_spec); @@ -690,7 +688,7 @@ tpsip_text_channel_send_message (GObject *object, /* Okay, it's valid. Let's send it. */ - msg_nh = tpsip_conn_create_request_handle (priv->conn, priv->handle); + msg_nh = tpsip_base_connection_create_handle (priv->conn, priv->handle); if (msg_nh == NULL) { g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, |