diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-01-24 13:51:12 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-01-24 13:51:12 +0100 |
| commit | 7ccf2359a26cf8f202bd8479051f056465d99bd2 (patch) | |
| tree | 3260618ee9fe0038b4f895c60c0861a72b9cd30c | |
| parent | 63fd11841909e96555c3e68a9b34c9ab130304af (diff) | |
cdo: notify properties changes after the props dict has been updated
| -rw-r--r-- | telepathy-glib/channel-dispatch-operation.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c index 386ab3d54..dcbc7eca8 100644 --- a/telepathy-glib/channel-dispatch-operation.c +++ b/telepathy-glib/channel-dispatch-operation.c @@ -223,15 +223,13 @@ maybe_set_connection (TpChannelDispatchOperation *self, return; } - g_object_notify ((GObject *) self, "connection"); - if (g_hash_table_lookup (self->priv->immutable_properties, - TP_PROP_CHANNEL_DISPATCH_OPERATION_CONNECTION) != NULL) - return; + TP_PROP_CHANNEL_DISPATCH_OPERATION_CONNECTION) == NULL) + g_hash_table_insert (self->priv->immutable_properties, + g_strdup (TP_PROP_CHANNEL_DISPATCH_OPERATION_CONNECTION), + tp_g_value_slice_new_boxed (DBUS_TYPE_G_OBJECT_PATH, path)); - g_hash_table_insert (self->priv->immutable_properties, - g_strdup (TP_PROP_CHANNEL_DISPATCH_OPERATION_CONNECTION), - tp_g_value_slice_new_boxed (DBUS_TYPE_G_OBJECT_PATH, path)); + g_object_notify ((GObject *) self, "connection"); } static void @@ -255,15 +253,13 @@ maybe_set_account (TpChannelDispatchOperation *self, return; } - g_object_notify ((GObject *) self, "account"); - if (g_hash_table_lookup (self->priv->immutable_properties, - TP_PROP_CHANNEL_DISPATCH_OPERATION_ACCOUNT) != NULL) - return; + TP_PROP_CHANNEL_DISPATCH_OPERATION_ACCOUNT) == NULL) + g_hash_table_insert (self->priv->immutable_properties, + g_strdup (TP_PROP_CHANNEL_DISPATCH_OPERATION_ACCOUNT), + tp_g_value_slice_new_boxed (DBUS_TYPE_G_OBJECT_PATH, path)); - g_hash_table_insert (self->priv->immutable_properties, - g_strdup (TP_PROP_CHANNEL_DISPATCH_OPERATION_ACCOUNT), - tp_g_value_slice_new_boxed (DBUS_TYPE_G_OBJECT_PATH, path)); + g_object_notify ((GObject *) self, "account"); } static void @@ -289,8 +285,6 @@ maybe_set_channel (TpChannelDispatchOperation *self, return; } - g_object_notify ((GObject *) self, "channel"); - if (g_hash_table_lookup (self->priv->immutable_properties, TP_PROP_CHANNEL_DISPATCH_OPERATION_CHANNEL) == NULL) { @@ -307,6 +301,8 @@ maybe_set_channel (TpChannelDispatchOperation *self, tp_g_value_slice_new_boxed ( TP_HASH_TYPE_STRING_VARIANT_MAP, properties)); } + + g_object_notify ((GObject *) self, "channel"); } static void |