summaryrefslogtreecommitdiff
path: root/camlibs/jd11
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2002-04-12 12:06:41 +0000
committerMarcus Meissner <marcus@jet.franken.de>2002-04-12 12:06:41 +0000
commitf1b7fd4abc749c7380fc2a189288bde52721a780 (patch)
tree8255f4de46f6ee1d5c7982db3f4f436a561e7239 /camlibs/jd11
parent262bd0a8ea6514cf082b5e1e04b2530cbb5971d8 (diff)
downloadlibgphoto2-f1b7fd4abc749c7380fc2a189288bde52721a780.tar.gz
* jd11.c, serial.c: Changed image/pnm to correct GP_MIME_PNM, so
konqueror displays it again. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4414 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/jd11')
-rw-r--r--camlibs/jd11/ChangeLog4
-rw-r--r--camlibs/jd11/jd11.c2
-rw-r--r--camlibs/jd11/serial.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/camlibs/jd11/ChangeLog b/camlibs/jd11/ChangeLog
index f23fa3fae..468f11a16 100644
--- a/camlibs/jd11/ChangeLog
+++ b/camlibs/jd11/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-12 Marcus Meissner <marcus@jet.franken.de>
+ * jd11.c, serial.c: Changed image/pnm to correct GP_MIME_PNM, so
+ konqueror displays it again.
+
2002-04-06 Marcus Meissner <marcus@jet.franken.de>
* jd11.c, serial.[ch]:
diff --git a/camlibs/jd11/jd11.c b/camlibs/jd11/jd11.c
index 68f8d56b0..426024b82 100644
--- a/camlibs/jd11/jd11.c
+++ b/camlibs/jd11/jd11.c
@@ -125,7 +125,7 @@ static int get_file_func (CameraFilesystem *fs, const char *folder,
return image_no;
gp_file_set_name (file, filename);
- gp_file_set_mime_type (file, "image/pnm");
+ gp_file_set_mime_type (file, GP_MIME_PNM);
switch (type) {
case GP_FILE_TYPE_RAW:
result = jd11_get_image_full(camera,file,image_no,1,context);
diff --git a/camlibs/jd11/serial.c b/camlibs/jd11/serial.c
index b5e8c7b8a..5665818d3 100644
--- a/camlibs/jd11/serial.c
+++ b/camlibs/jd11/serial.c
@@ -424,7 +424,7 @@ jd11_index_reader(GPPort *port, CameraFilesystem *fs, GPContext *context) {
info.file.fields = GP_FILE_INFO_TYPE | GP_FILE_INFO_NAME |
GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
GP_FILE_INFO_SIZE;
- strcpy(info.file.type,"image/pnm");
+ strcpy(info.file.type,GP_MIME_PNM);
strcpy(info.file.name,fn);
info.file.width = 640;
info.file.height = 480;