From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 9 Apr 2015 00:30:26 +0000 (-0400)
Subject: Make gtk-update-icon-cache not fall over leftover temp files
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~9922
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=096b49013acb8cebffde1f857ee63aa83c247839;p=gtk4.git

Make gtk-update-icon-cache not fall over leftover temp files

This is a followup to 0fd185fa6de2a89c11b4a28. There is no
good reason to only try again if --force is passed. Do it
always.

See
https://bugzilla.redhat.com/show_bug.cgi?id=1194957
---

diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index 6944a07f55..e71d6fbebc 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -1491,7 +1491,7 @@ build_cache (const gchar *path)
 opentmp:
   if ((fd = g_open (tmp_cache_path, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC | _O_BINARY, mode)) == -1)
     {
-      if (force_update && retry_count == 0)
+      if (retry_count == 0)
         {
           retry_count++;
           g_remove (tmp_cache_path);