summaryrefslogtreecommitdiff
path: root/camlibs/directory/directory.c
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2009-02-16 08:09:49 +0000
committerMarcus Meissner <marcus@jet.franken.de>2009-02-16 08:09:49 +0000
commitbb3d18289e752db9dff5f7e60e5368f46bdd1a8a (patch)
tree8b96a77cc35ca978600cbe450a0503d3dd6dc5aa /camlibs/directory/directory.c
parent2d0eae7c878f9ee870df185d27e0fafd120a4b42 (diff)
downloadlibgphoto2-bb3d18289e752db9dff5f7e60e5368f46bdd1a8a.tar.gz
Batch commit from weekend work:
- removed "type" from CameraFile handling: - all put_file functions and hooks get "type" as argument now - added type to the set_file_info_noop call - started removal of "name" from CameraFile - generate new filename from original filename + camerafile type + mimetype - new gp_camera_autodetect() helper function - adapted all drivers. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11818 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/directory/directory.c')
-rw-r--r--camlibs/directory/directory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c
index ad855ce7b..13b7bc1b7 100644
--- a/camlibs/directory/directory.c
+++ b/camlibs/directory/directory.c
@@ -637,7 +637,7 @@ delete_file_func (CameraFilesystem *fs, const char *folder,
static int
put_file_func (CameraFilesystem *fs, const char *folder, const char *name,
- CameraFile *file, void *data, GPContext *context)
+ CameraFileType type, CameraFile *file, void *data, GPContext *context)
{
char path[2048];
int result;