callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the old icon cache if regenerating it would cause it to be empty

Browse Source 
Signed-off-by: Federico Mena Quintero <federico@novell.com>

svn path=/trunk/; revision=20865
This commit is contained in:
Federico Mena Quintero 2008-07-18 19:28:13 +00:00 committed by Federico Mena Quintero
parent 46047f173e
commit 5bd03f2b44
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -13,6 +13,11 @@
* gdk/directfb/gdkvisual-directfb.c: Avoid a crash in * gdk/directfb/gdkvisual-directfb.c: Avoid a crash in
_gdk_visual_init(). Patch by Huimin He. _gdk_visual_init(). Patch by Huimin He.
2008-07-18 Federico Mena Quintero <federico@novell.com>
* gtk/updateiconcache.c (build_cache): If the resulting cache file
would be empty, erase the old cache file as well as the temporary file.
2008-07-18 Federico Mena Quintero <federico@novell.com> 2008-07-18 Federico Mena Quintero <federico@novell.com>
* demos/gtk-demo/changedisplay.c (find_toplevel_at_pointer): Don't * demos/gtk-demo/changedisplay.c (find_toplevel_at_pointer): Don't

4
gtk/updateiconcache.c
View File

@ -1448,6 +1448,7 @@ build_cache (const gchar *path)
#endif #endif
tmp_cache_path = g_build_filename (path, "."CACHE_NAME, NULL); tmp_cache_path = g_build_filename (path, "."CACHE_NAME, NULL);
cache_path = g_build_filename (path, CACHE_NAME, NULL);
if ((fd = g_open (tmp_cache_path, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC | _O_BINARY, mode)) == -1) if ((fd = g_open (tmp_cache_path, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC | _O_BINARY, mode)) == -1)
{ {
@ -1476,6 +1477,7 @@ build_cache (const gchar *path)
fclose (cache); fclose (cache);
g_unlink (tmp_cache_path); g_unlink (tmp_cache_path);
g_unlink (cache_path);
exit (0); exit (0);
} }
@ -1499,8 +1501,6 @@ build_cache (const gchar *path)
exit (1); exit (1);
} }
cache_path = g_build_filename (path, CACHE_NAME, NULL);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (g_file_test (cache_path, G_FILE_TEST_EXISTS)) if (g_file_test (cache_path, G_FILE_TEST_EXISTS))
{ {