diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-13 23:58:14 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-13 23:58:14 +0800 |
| commit | a74be9c64f64980bf542f07fe970787cfd0599e9 (patch) | |
| tree | 21075432d89271ac93e247138bf2c9d381b34fa5 | |
| parent | 1c67913708fb51caa7f769631a0a705b6f6553e6 (diff) | |
| parent | 77d5de2dc9f4e8602151e4a22db98ebf41b36453 (diff) | |
| download | gsoc2013-empathy-a74be9c64f64980bf542f07fe970787cfd0599e9.tar gsoc2013-empathy-a74be9c64f64980bf542f07fe970787cfd0599e9.tar.gz gsoc2013-empathy-a74be9c64f64980bf542f07fe970787cfd0599e9.tar.bz2 gsoc2013-empathy-a74be9c64f64980bf542f07fe970787cfd0599e9.tar.lz gsoc2013-empathy-a74be9c64f64980bf542f07fe970787cfd0599e9.tar.xz gsoc2013-empathy-a74be9c64f64980bf542f07fe970787cfd0599e9.tar.zst gsoc2013-empathy-a74be9c64f64980bf542f07fe970787cfd0599e9.zip | |
Merge branch 'channel-accessors'
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libempathy/empathy-tp-call.c | 7 | ||||
| -rw-r--r-- | libempathy/empathy-tp-file.c | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index b4510478a..359d6ecc3 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ LIBCANBERRA_GTK_REQUIRED=0.4 LIBNOTIFY_REQUIRED=0.4.4 LIBNOTIFY_REQUIRED_GTK3=0.5.1 TELEPATHY_FARSIGHT_REQUIRED=0.0.14 -TELEPATHY_GLIB_REQUIRED=0.11.14 +TELEPATHY_GLIB_REQUIRED=0.11.15 TELEPATHY_LOGGER=0.1.5 UNIQUE_REQUIRED=1.1.2 diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c index 9dcf9bfd7..1a53de65d 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 3ad81af62..25a8c40bc 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); |