summaryrefslogtreecommitdiff
path: root/telepathy-glib/base-client.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2011-07-12 12:31:31 +0200
committerXavier Claessens <xclaesse@gmail.com>2011-07-12 12:42:46 +0200
commitebf70605418bd424e32973d49b6e3d86e053524c (patch)
tree1b6d34b61834248aef88400551b7b2e3386ada6e /telepathy-glib/base-client.c
parent83858d2f09064fa00011ffca1608b4619c941f7a (diff)
downloadtelepathy-glib-ebf70605418bd424e32973d49b6e3d86e053524c.tar.gz
Factor out _tp_g_ptr_array_sized_new_with_free_func()
Diffstat (limited to 'telepathy-glib/base-client.c')
-rw-r--r--telepathy-glib/base-client.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 958dbd654..d6c96b879 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -1640,8 +1640,8 @@ _tp_base_client_observe_channels (TpSvcClientObserver *iface,
goto out;
}
- channels = g_ptr_array_sized_new (channels_arr->len);
- g_ptr_array_set_free_func (channels, g_object_unref);
+ channels = _tp_g_ptr_array_sized_new_with_free_func (channels_arr->len,
+ g_object_unref);
for (i = 0; i < channels_arr->len; i++)
{
const gchar *chan_path;
@@ -1678,8 +1678,8 @@ _tp_base_client_observe_channels (TpSvcClientObserver *iface,
}
}
- requests = g_ptr_array_sized_new (requests_arr->len);
- g_ptr_array_set_free_func (requests, g_object_unref);
+ requests = _tp_g_ptr_array_sized_new_with_free_func (requests_arr->len,
+ g_object_unref);
for (i = 0; i < requests_arr->len; i++)
{
const gchar *req_path = g_ptr_array_index (requests_arr, i);
@@ -1859,8 +1859,8 @@ _tp_base_client_add_dispatch_operation (TpSvcClientApprover *iface,
goto out;
}
- channels = g_ptr_array_sized_new (channels_arr->len);
- g_ptr_array_set_free_func (channels, g_object_unref);
+ channels = _tp_g_ptr_array_sized_new_with_free_func (channels_arr->len,
+ g_object_unref);
for (i = 0; i < channels_arr->len; i++)
{
const gchar *chan_path;
@@ -2206,8 +2206,8 @@ _tp_base_client_handle_channels (TpSvcClientHandler *iface,
goto out;
}
- channels = g_ptr_array_sized_new (channels_arr->len);
- g_ptr_array_set_free_func (channels, g_object_unref);
+ channels = _tp_g_ptr_array_sized_new_with_free_func (channels_arr->len,
+ g_object_unref);
for (i = 0; i < channels_arr->len; i++)
{
const gchar *chan_path;
@@ -2228,8 +2228,8 @@ _tp_base_client_handle_channels (TpSvcClientHandler *iface,
g_ptr_array_add (channels, channel);
}
- requests = g_ptr_array_sized_new (requests_arr->len);
- g_ptr_array_set_free_func (requests, g_object_unref);
+ requests = _tp_g_ptr_array_sized_new_with_free_func (requests_arr->len,
+ g_object_unref);
for (i = 0; i < requests_arr->len; i++)
{
const gchar *req_path = g_ptr_array_index (requests_arr, i);
@@ -2955,8 +2955,8 @@ delegate_channels_ctx_new (GList *channels)
DelegateChannelsCtx *ctx = g_slice_new0 (DelegateChannelsCtx);
GList *l;
- ctx->channels = g_ptr_array_sized_new (g_list_length (channels));
- g_ptr_array_set_free_func (ctx->channels, g_object_unref);
+ ctx->channels = _tp_g_ptr_array_sized_new_with_free_func (
+ g_list_length (channels), g_object_unref);
for (l = channels; l != NULL; l = g_list_next (l))
{
@@ -3101,8 +3101,8 @@ tp_base_client_delegate_channels_async (TpBaseClient *self,
cd = tp_channel_dispatcher_new (self->priv->dbus);
- chans = g_ptr_array_sized_new (g_list_length (channels));
- g_ptr_array_set_free_func (chans, g_free);
+ chans = _tp_g_ptr_array_sized_new_with_free_func (g_list_length (channels),
+ g_free);
for (l = channels; l != NULL; l = g_list_next (l))
{