diff options
| author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-01-31 21:11:11 +0200 |
|---|---|---|
| committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-02 17:22:06 +0200 |
| commit | fb6825a550f8825962bc32fbedbbc401e92cb7d9 (patch) | |
| tree | 5aa9f4ff593751044ed0435ae1bc66912439e198 | |
| parent | d668e5dd9c09fd5c13b2e6ac06f5a905bd5f8c98 (diff) | |
media-factory: use tpsip/handles
| -rw-r--r-- | src/media-factory.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/media-factory.c b/src/media-factory.c index f6afc01..14e13b7 100644 --- a/src/media-factory.c +++ b/src/media-factory.c @@ -28,7 +28,7 @@ #include "sip-media-channel.h" #include <tpsip/base-connection.h> -#include "sip-connection-helpers.h" +#include <tpsip/handles.h> #include <sofia-sip/sip_status.h> @@ -337,15 +337,12 @@ tpsip_nua_i_invite_cb (TpBaseConnection *conn, TpsipMediaFactory *fac) { TpsipMediaChannel *channel; - TpHandleRepoIface *contact_repo; TpHandle handle; guint channel_flags = 0; /* figure out a handle for the identity */ - contact_repo = tp_base_connection_get_handles (conn, TP_HANDLE_TYPE_CONTACT); - - handle = tpsip_handle_parse_from (contact_repo, ev->sip); + handle = tpsip_handle_by_requestor (conn, ev->sip); if (!handle) { MESSAGE ("incoming INVITE with invalid sender information"); @@ -354,7 +351,7 @@ tpsip_nua_i_invite_cb (TpBaseConnection *conn, } DEBUG("Got incoming invite from <%s>", - tp_handle_inspect (contact_repo, handle)); + tpsip_handle_inspect (conn, handle)); if (handle == conn->self_handle) { @@ -365,7 +362,7 @@ tpsip_nua_i_invite_cb (TpBaseConnection *conn, channel = new_media_channel (fac, handle, handle, channel_flags); - tp_handle_unref (contact_repo, handle); + tpsip_handle_unref (conn, handle); /* We delay emission of NewChannel(s) until we have the data on * initial media */ |