diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-01-14 10:58:06 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-05-12 12:30:39 +0200 |
| commit | 97f81499baad0e6f5aa98d9cbadf22e18ad99437 (patch) | |
| tree | 6e26daa5815e26888442bb436788fb98ef5feab6 /telepathy-glib/channel-dispatch-operation.c | |
| parent | d81a898ad5e4c86aa66c9b62e431c31aea017eca (diff) | |
| download | telepathy-glib-97f81499baad0e6f5aa98d9cbadf22e18ad99437.tar.gz | |
channel-dispatch-operation: simplify core preparation
Diffstat (limited to 'telepathy-glib/channel-dispatch-operation.c')
| -rw-r--r-- | telepathy-glib/channel-dispatch-operation.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c index cd2351f1d..48a0d4b3d 100644 --- a/telepathy-glib/channel-dispatch-operation.c +++ b/telepathy-glib/channel-dispatch-operation.c @@ -116,8 +116,6 @@ struct _TpChannelDispatchOperationPrivate { GPtrArray *channels; GStrv possible_handlers; GHashTable *immutable_properties; - - gboolean preparing_core; }; enum @@ -593,8 +591,6 @@ get_dispatch_operation_prop_cb (TpProxy *proxy, GPtrArray *channels; GError *e = NULL; - self->priv->preparing_core = FALSE; - if (error != NULL) { DEBUG ("Failed to fetch ChannelDispatchOperation properties: %s", @@ -680,22 +676,10 @@ out: } static void -maybe_prepare_core (TpProxy *proxy) +prepare_core (TpProxy *proxy) { TpChannelDispatchOperation *self = (TpChannelDispatchOperation *) proxy; - if (tp_proxy_is_prepared (proxy, TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE)) - return; /* already done */ - - if (self->priv->preparing_core) - return; /* already running */ - - if (!_tp_proxy_is_preparing (proxy, - TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE)) - return; /* not interested right now */ - - self->priv->preparing_core = TRUE; - tp_cli_dbus_properties_call_get_all (self, -1, TP_IFACE_CHANNEL_DISPATCH_OPERATION, get_dispatch_operation_prop_cb, @@ -717,7 +701,7 @@ tp_channel_dispatch_operation_list_features (TpProxyClass *cls G_GNUC_UNUSED) features[FEAT_CORE].name = TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE; features[FEAT_CORE].core = TRUE; - features[FEAT_CORE].start_preparing = maybe_prepare_core; + features[FEAT_CORE].start_preparing = prepare_core; /* assert that the terminator at the end is there */ g_assert (features[N_FEAT].name == 0); |