summaryrefslogtreecommitdiffstats
path: root/collection
diff options
context:
space:
mode:
authorDmitri Pal <dpal@redhat.com>2010-11-26 22:54:02 -0500
committerStephen Gallagher <sgallagh@redhat.com>2010-12-21 11:16:09 -0500
commitf7a48c6b5975259f20780a6353a1325852e71850 (patch)
tree4fc8bce5b98245605c46587c309dce6b58e1a5be /collection
parentfdb79f1e66baff7461ab686b1c29f819d861030b (diff)
downloadding-libs2-f7a48c6b5975259f20780a6353a1325852e71850.tar.gz
ding-libs2-f7a48c6b5975259f20780a6353a1325852e71850.tar.xz
ding-libs2-f7a48c6b5975259f20780a6353a1325852e71850.zip
Fix copy collection
Collection with subcollections was failing to pass copy callback to the subcollections.
Diffstat (limited to 'collection')
-rw-r--r--collection/collection.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/collection/collection.c b/collection/collection.c
index f24102b..4bee949 100644
--- a/collection/collection.c
+++ b/collection/collection.c
@@ -2091,10 +2091,12 @@ static int col_copy_traverse_handler(struct collection_item *head,
switch (traverse_data->mode) {
case COL_COPY_NORMAL:
- error = col_copy_collection(&other,
+ error = col_copy_collection_with_cb(&other,
*((struct collection_item **)(current->data)),
current->property,
- COL_COPY_NORMAL);
+ COL_COPY_NORMAL,
+ traverse_data->copy_cb,
+ traverse_data->ext_data);
if (error) {
TRACE_ERROR_NUMBER("Copy subcollection returned error:", error);
return error;