[SCM] easytag/master: Avoid crash when saving unknown image types

[amigadave-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e541ca7df964f34557682a0ebef2df328211bb97
Author: David King <amigadave at amigadave.com>
Date:   Fri Mar 7 23:56:49 2014 +0000

    Avoid crash when saving unknown image types

diff --git a/debian/patches/avoid-unknown-image-save-crash.patch b/debian/patches/avoid-unknown-image-save-crash.patch
new file mode 100644
index 0000000..3b7c0da
--- /dev/null
+++ b/debian/patches/avoid-unknown-image-save-crash.patch
@@ -0,0 +1,21 @@
+Description: Avoid crash when saving unknown image types
+Origin: upstream, https://git.gnome.org/browse/easytag/patch/?id=6563a0989a6d35d618a950262bd81d2ac50ed0ed
+Applied-Upstream: 2.1.11, https://git.gnome.org/browse/easytag/commit/?id=6563a0989a6d35d618a950262bd81d2ac50ed0ed
+From: David King <amigadave at amigadave.com>
+---
+diff --git a/src/picture.c b/src/picture.c
+index b6b8f26..8e74b93 100644
+--- a/src/picture.c
++++ b/src/picture.c
+@@ -988,7 +988,8 @@ const gchar *Picture_Mime_Type_String (Picture_Format format)
+         case PICTURE_FORMAT_PNG:
+             return "image/png";
+         default:
+-            return NULL;
++            g_debug ("%s", "Unrecognised image MIME type");
++            return "application/octet-stream";
+     }
+ }
+ 
+--
+cgit v0.9.2
diff --git a/debian/patches/series b/debian/patches/series
index 1bee884..9ab1f80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-close-button-crash.patch
 fix-decline-delete-file-crash.patch
+avoid-unknown-image-save-crash.patch

-- 
easytag packaging