diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-27 11:02:53 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-30 11:47:20 +0200 |
| commit | d4490b3357fce06549503095f4b7fc983ab0b261 (patch) | |
| tree | d1994fe98f97b7cf6828fb92de2da2f350b88541 /tests/lib | |
| parent | bf226f20c5a42e6f350f620fe54924a746777666 (diff) | |
| download | telepathy-glib-d4490b3357fce06549503095f4b7fc983ab0b261.tar.gz | |
simple-conn: rename priv->channels to priv->text_channels
Diffstat (limited to 'tests/lib')
| -rw-r--r-- | tests/lib/simple-conn.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/lib/simple-conn.c b/tests/lib/simple-conn.c index 46f14df13..5478a17cf 100644 --- a/tests/lib/simple-conn.c +++ b/tests/lib/simple-conn.c @@ -60,7 +60,7 @@ struct _TpTestsSimpleConnectionPrivate gboolean break_fastpath_props; /* TpHandle => reffed TpTestsTextChannelNull */ - GHashTable *channels; + GHashTable *text_channels; TpTestsRoomListChan *room_list_chan; GError *get_self_handle_error /* initially NULL */ ; @@ -72,7 +72,7 @@ tp_tests_simple_connection_init (TpTestsSimpleConnection *self) self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TESTS_TYPE_SIMPLE_CONNECTION, TpTestsSimpleConnectionPrivate); - self->priv->channels = g_hash_table_new_full (NULL, NULL, NULL, + self->priv->text_channels = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_object_unref); } @@ -138,7 +138,7 @@ dispose (GObject *object) { TpTestsSimpleConnection *self = TP_TESTS_SIMPLE_CONNECTION (object); - g_hash_table_unref (self->priv->channels); + g_hash_table_unref (self->priv->text_channels); g_clear_object (&self->priv->room_list_chan); G_OBJECT_CLASS (tp_tests_simple_connection_parent_class)->dispose (object); @@ -265,7 +265,7 @@ pretend_disconnected (gpointer data) TpTestsSimpleConnection *self = TP_TESTS_SIMPLE_CONNECTION (data); /* We are disconnected, all our channels are invalidated */ - g_hash_table_remove_all (self->priv->channels); + g_hash_table_remove_all (self->priv->text_channels); g_clear_object (&self->priv->room_list_chan); tp_base_connection_finish_shutdown (TP_BASE_CONNECTION (data)); @@ -383,7 +383,8 @@ tp_tests_simple_connection_ensure_text_chan (TpTestsSimpleConnection *self, handle = tp_handle_ensure (contact_repo, target_id, NULL, NULL); - chan = g_hash_table_lookup (self->priv->channels, GUINT_TO_POINTER (handle)); + chan = g_hash_table_lookup (self->priv->text_channels, + GUINT_TO_POINTER (handle)); if (chan != NULL) { /* Channel already exist, reuse it */ @@ -402,7 +403,7 @@ tp_tests_simple_connection_ensure_text_chan (TpTestsSimpleConnection *self, "handle", handle, NULL)); - g_hash_table_insert (self->priv->channels, GUINT_TO_POINTER (handle), + g_hash_table_insert (self->priv->text_channels, GUINT_TO_POINTER (handle), chan); } |