[empathy: 2/3] use tp_channel_get_requested()

[Guillaume Desmottes <gdesmott src gnome org>]

commit 77d5de2dc9f4e8602151e4a22db98ebf41b36453
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Sep 13 17:49:04 2010 +0200

    use tp_channel_get_requested()

 libempathy/empathy-tp-call.c |    7 +------
 libempathy/empathy-tp-file.c |    4 +---
 2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index 9dcf9bf..1a53de6 100644
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -378,8 +378,6 @@ tp_call_constructor (GType type,
   GObject *object;
   EmpathyTpCall *call;
   EmpathyTpCallPriv *priv;
-  GHashTable *props;
-  gboolean requested;
 
   object = G_OBJECT_CLASS (empathy_tp_call_parent_class)->constructor (type,
       n_construct_params, construct_params);
@@ -404,10 +402,7 @@ tp_call_constructor (GType type,
       tp_call_request_streams_cb, NULL, NULL, G_OBJECT (call));
 
   /* Is the call incoming? */
-  props = tp_channel_borrow_immutable_properties (priv->channel);
-  requested = tp_asv_get_boolean (props, TP_PROP_CHANNEL_REQUESTED, NULL);
-
-  priv->is_incoming = !requested;
+  priv->is_incoming = !tp_channel_get_requested (priv->channel);
 
   /* Get the remote contact */
   empathy_tp_contact_factory_get_from_handle (
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index 3ad81af..25a8c40 100644
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -787,7 +787,6 @@ do_constructed (GObject *object)
 {
   EmpathyTpFile *tp_file;
   EmpathyTpFilePriv *priv;
-  GHashTable *props;
 
   tp_file = EMPATHY_TP_FILE (object);
   priv = GET_PRIV (tp_file);
@@ -795,8 +794,7 @@ do_constructed (GObject *object)
   g_signal_connect (priv->channel, "invalidated",
     G_CALLBACK (tp_file_invalidated_cb), tp_file);
 
-  props = tp_channel_borrow_immutable_properties (priv->channel);
-  priv->incoming = !tp_asv_get_boolean (props, TP_PROP_CHANNEL_REQUESTED, NULL);
+  priv->incoming = !tp_channel_get_requested (priv->channel);
 
   tp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed (
       priv->channel, tp_file_state_changed_cb, NULL, NULL, object, NULL);