summaryrefslogtreecommitdiff
path: root/camlibs/barbie/barbie.c
diff options
context:
space:
mode:
authorLutz Mueller <lutz@users.sourceforge.net>2001-08-22 18:09:42 +0000
committerLutz Mueller <lutz@users.sourceforge.net>2001-08-22 18:09:42 +0000
commitabe27e1c9865e0ea87a1c7e86c9f282ce5f91459 (patch)
treedc44fb11c8aeecf02de6350806be9f6f87ca23e1 /camlibs/barbie/barbie.c
parent613412afabd91ee6d8b9b57ba6c6f12879f21946 (diff)
downloadlibgphoto2-abe27e1c9865e0ea87a1c7e86c9f282ce5f91459.tar.gz
2001-08-22 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* */*: Small parameter changes to make gphoto2 API more consistent. More to follow. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2046 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/barbie/barbie.c')
-rw-r--r--camlibs/barbie/barbie.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c
index a13bef376..9c7d0d3cc 100644
--- a/camlibs/barbie/barbie.c
+++ b/camlibs/barbie/barbie.c
@@ -102,7 +102,7 @@ int camera_init(Camera *camera) {
gp_port_open(b->dev);
/* Create the filesystem */
- b->fs = gp_filesystem_new();
+ gp_filesystem_new(&b->fs);
return (barbie_ping(b));
}
@@ -130,14 +130,17 @@ int camera_folder_list_files (Camera *camera, const char *folder, CameraList *li
int count, x;
BarbieStruct *b = (BarbieStruct*)camera->camlib_data;
+ const char *name;
count = barbie_file_count(b);
/* Populate the filesystem */
gp_filesystem_populate (b->fs, "/", "mattel%02i.ppm", count);
- for (x = 0; x < gp_filesystem_count (b->fs, folder); x++)
- gp_list_append (list, gp_filesystem_name (b->fs, folder, x));
+ for (x = 0; x < gp_filesystem_count (b->fs, folder); x++) {
+ gp_filesystem_name (b->fs, folder, x, &name);
+ gp_list_append (list, name, NULL);
+ }
return GP_OK;
}