diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2009-01-25 20:30:53 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2009-01-25 20:30:53 +0000 |
| commit | a3ee73043c5dc7c28b5717fd971917627a7214f2 (patch) | |
| tree | 4249bb9b1b0debbe19c6df749f8d045bcc39a055 /camlibs/sx330z | |
| parent | ccd327a379d7885389f57f0e8304c4cce948921f (diff) | |
| download | libgphoto2-a3ee73043c5dc7c28b5717fd971917627a7214f2.tar.gz | |
* removed CameraFileInfoFile.name, adjusted users
and callers.
* added filename argument to put_file_func,
set_info_noop and set_file_noop functions.
adjusted all camlibs
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11773 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sx330z')
| -rw-r--r-- | camlibs/sx330z/library.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/camlibs/sx330z/library.c b/camlibs/sx330z/library.c index c31b8d66b..ef0f9f99e 100644 --- a/camlibs/sx330z/library.c +++ b/camlibs/sx330z/library.c @@ -141,6 +141,7 @@ file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list, for (pcnt = 0; pcnt < tpages; pcnt++) { CR (sx330z_get_toc_page (camera, context, &toc, pcnt)); for (ecnt = 0; ecnt < toc.numEntries; ecnt++) { + char fn[20]; info.audio.fields = GP_FILE_INFO_NONE; info.preview.fields = GP_FILE_INFO_TYPE; @@ -152,16 +153,14 @@ file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list, info.file.permissions = GP_FILE_PERM_READ | GP_FILE_PERM_DELETE; strcpy (info.file.type,GP_MIME_JPEG); - sprintf (info.file.name, "%.12s", - toc.entries[ecnt].name); + sprintf (fn, "%.12s", toc.entries[ecnt].name); /* * Append directly to the filesystem instead of to * the list, because we have additional information. */ - gp_filesystem_append (camera->fs, folder, - info.file.name, context); - gp_filesystem_set_info_noop (camera->fs, folder, + gp_filesystem_append (camera->fs, folder, fn, context); + gp_filesystem_set_info_noop (camera->fs, folder, fn, info, context); } gp_context_progress_update (context, id, pcnt); |