diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2014-11-05 20:38:57 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2014-11-05 20:38:57 +0000 |
| commit | 4b0e3201b36979ec7b5581924839d1acd715f02b (patch) | |
| tree | b3afa51cc59fa3d593c781a8c082cf979e0a1fba | |
| parent | 49e5bbdc3a1474c78a209ef81beb3bbee700b239 (diff) | |
| download | libgphoto2-4b0e3201b36979ec7b5581924839d1acd715f02b.tar.gz | |
GP_MIME_TXT == text/plain for .txt
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15233 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | gphoto2/gphoto2-file.h | 1 | ||||
| -rw-r--r-- | libgphoto2/gphoto2-file.c | 2 | ||||
| -rw-r--r-- | libgphoto2/gphoto2-filesys.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/gphoto2/gphoto2-file.h b/gphoto2/gphoto2-file.h index d1159ae13..81a4787d5 100644 --- a/gphoto2/gphoto2-file.h +++ b/gphoto2/gphoto2-file.h @@ -33,6 +33,7 @@ extern "C" { #endif /* __cplusplus */ +#define GP_MIME_TXT "text/plain" #define GP_MIME_WAV "audio/wav" #define GP_MIME_RAW "image/x-raw" #define GP_MIME_PNG "image/png" diff --git a/libgphoto2/gphoto2-file.c b/libgphoto2/gphoto2-file.c index ecc711c7f..349218d14 100644 --- a/libgphoto2/gphoto2-file.c +++ b/libgphoto2/gphoto2-file.c @@ -586,6 +586,7 @@ static const char *mime_table[] = { "mts", GP_MIME_AVCHD, "m2ts", GP_MIME_AVCHD, "arw", GP_MIME_ARW, + "txt", GP_MIME_TXT, NULL}; /** * @param file a #CameraFile @@ -1073,6 +1074,7 @@ gp_file_adjust_name_for_mime_type (CameraFile *file) GP_MIME_AVI, "avi", GP_MIME_CRW, "crw", GP_MIME_CR2, "cr2", + GP_MIME_TXT, "txt", NULL}; C_PARAMS (file); diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c index c1d65772c..129bec5ca 100644 --- a/libgphoto2/gphoto2-filesys.c +++ b/libgphoto2/gphoto2-filesys.c @@ -1587,8 +1587,8 @@ gp_filesystem_get_file_impl (CameraFilesystem *fs, const char *folder, return GP_OK; } - gp_context_status (context, _("Downloading '%s' from folder '%s'..."), - filename, folder); + GP_LOG_D ("Downloading '%s' from folder '%s'...", filename, folder); + CR (fs->get_file_func (fs, folder, filename, type, file, fs->data, context)); |