[SCM] easytag/master: Avoid crash when declining deleting a file

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

The following commit has been merged in the master branch:
commit 09c949915b94dedbb2d4c1518f2afdcdede7c909
Author: David King <amigadave at amigadave.com>
Date:   Fri Mar 7 16:02:05 2014 +0000

    Avoid crash when declining deleting a file

diff --git a/debian/patches/fix-decline-delete-file-crash.patch b/debian/patches/fix-decline-delete-file-crash.patch
new file mode 100644
index 0000000..0b47812
--- /dev/null
+++ b/debian/patches/fix-decline-delete-file-crash.patch
@@ -0,0 +1,29 @@
+Description: Avoid crash when declining deleting a file
+Origin: upstream, https://git.gnome.org/browse/easytag/patch/?id=17afda799f95c97263e52ab41fa8c9676aba3021
+Applied-Upstream: 2.1.11, https://git.gnome.org/browse/easytag/commit/?id=17afda799f95c97263e52ab41fa8c9676aba3021
+From: David King <amigadave at amigadave.com>
+---
+diff --git a/src/easytag.c b/src/easytag.c
+index 40dbeec..52a1619 100644
+--- a/src/easytag.c
++++ b/src/easytag.c
+@@ -2637,9 +2637,14 @@ Delete_Selected_Files_With_Answer (void)
+                 ET_Remove_File_From_File_List(ETFile);
+                 break;
+             case 0:
+-                Log_Print (LOG_ERROR, _("Cannot delete file (%s)"),
+-                           error->message);
+-                g_error_free (error);
++                /* Distinguish between the file being skipped, and there being
++                 * an error during deletion. */
++                if (error)
++                {
++                    Log_Print (LOG_ERROR, _("Cannot delete file (%s)"),
++                               error->message);
++                    g_clear_error (&error);
++                }
+                 break;
+             case -1:
+                 // Stop deleting files + reinit progress bar
+--
+cgit v0.9.2
diff --git a/debian/patches/series b/debian/patches/series
index 4280d60..1bee884 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-close-button-crash.patch
+fix-decline-delete-file-crash.patch

-- 
easytag packaging