diff src/editors.c @ 2745:86dad5529aed

Merge with upstream changes.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 13 Apr 2018 19:06:23 +0300
parents 10ca4efb9d48 0b612372e82c
children 49bd0d974e88
line wrap: on
line diff
--- a/src/editors.c	Sun Mar 04 19:01:45 2018 +0200
+++ b/src/editors.c	Fri Apr 13 19:06:23 2018 +0300
@@ -111,7 +111,7 @@
 		{"image/*",		"*"},
 		{"image/bmp",		".bmp"},
 		{"image/gif",		".gif"},
-		{"image/jpeg",		".jpeg;.jpg"},
+		{"image/jpeg",		".jpeg;.jpg;.mpo"},
 		{"image/jpg",		".jpg;.jpeg"},
 		{"image/bpg",		".bpg"},
 		{"image/pcx",		".pcx"},
@@ -119,19 +119,25 @@
 		{"image/svg",		".svg"},
 		{"image/svg+xml",	".svg"},
 		{"image/svg+xml-compressed", 	".svg"},
-		{"image/tiff",		".tiff;.tif"},
+		{"image/tiff",		".tiff;.tif;.mef"},
+		{"image/vnd-ms.dds",	".dds"},
+		{"image/x-adobe-dng",	".dng"},
 		{"image/x-bmp",		".bmp"},
 		{"image/x-canon-crw",	".crw"},
 		{"image/x-canon-cr2",	".cr2"},
 		{"image/x-cr2",		".cr2"},
-		{"image/x-dcraw",	"%raw"},
+		{"image/x-dcraw",	"%raw;.mos"},
 		{"image/x-epson-erf",	"%erf"},
 		{"image/x-ico",		".ico"},
+		{"image/x-kodak-kdc",	".kdc"},
 		{"image/x-mrw",		".mrw"},
 		{"image/x-minolta-mrw",	".mrw"},
 		{"image/x-MS-bmp",	".bmp"},
 		{"image/x-nef",		".nef"},
 		{"image/x-nikon-nef",	".nef"},
+		{"image/x-panasonic-raw",	".raw"},
+		{"image/x-panasonic-rw2",	".rw2"},
+		{"image/x-pentax-pef",	".pef"},
 		{"image/x-orf",		".orf"},
 		{"image/x-olympus-orf",	".orf"},
 		{"image/x-pcx",		".pcx"},
@@ -145,11 +151,15 @@
 		{"image/x-raf",		".raf"},
 		{"image/x-fuji-raf",	".raf"},
 		{"image/x-sgi",		".sgi"},
+		{"image/x-sony-arw",	".arw"},
+		{"image/x-sony-sr2",	".sr2"},
+		{"image/x-sony-srf",	".srf"},
 		{"image/x-tga",		".tga"},
 		{"image/x-xbitmap",	".xbm"},
 		{"image/x-xcf",		".xcf"},
 		{"image/x-xpixmap",	".xpm"},
 		{"image/x-x3f",		".x3f"},
+		{"application/x-navi-animation",		".ani"},
 		{"application/x-ptoptimizer-script",	".pto"},
 		{NULL, NULL}};
 
@@ -544,7 +554,7 @@
 				   NULL, FALSE,
 				   NULL, ed);
 	buf = g_strdup_printf(_("Output of %s"), text);
-	generic_dialog_add_message(vd->gd, NULL, buf, NULL, TRUE);
+	generic_dialog_add_message(vd->gd, NULL, buf, NULL, FALSE);
 	g_free(buf);
 	vd->button_stop = generic_dialog_add_button(vd->gd, GTK_STOCK_STOP, NULL,
 						   editor_verbose_window_stop, FALSE);