From 77134e824c26e2ac4d2172e17fcabadd9ea418d7 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Thu, 18 Sep 2008 16:33:19 +0000 Subject: [PATCH] don't fail if the destination files already exist and the user tries to 2008-09-18 Jens Granseuer * theme-save.c: (write_theme_to_disk): don't fail if the destination files already exist and the user tries to overwrite them (bug #552671) svn path=/trunk/; revision=8972 --- capplets/appearance/ChangeLog | 5 +++++ capplets/appearance/theme-save.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index 82fdd92ad..fef422b00 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,8 @@ +2008-09-18 Jens Granseuer + + * theme-save.c: (write_theme_to_disk): don't fail if the destination + files already exist and the user tries to overwrite them (bug #552671) + 2008-08-22 Jens Granseuer * appearance-style.c: (conv_to_widget_cb), (create_thumbnail), diff --git a/capplets/appearance/theme-save.c b/capplets/appearance/theme-save.c index 4a991ee9a..24507384a 100644 --- a/capplets/appearance/theme-save.c +++ b/capplets/appearance/theme-save.c @@ -204,7 +204,7 @@ write_theme_to_disk (GnomeThemeMetaInfo *theme_info, theme_info->metacity_theme_name, theme_info->icon_theme_name); - output = G_OUTPUT_STREAM (g_file_create (tmp_file, G_FILE_CREATE_NONE, NULL, NULL)); + output = G_OUTPUT_STREAM (g_file_replace (tmp_file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL)); g_output_stream_write (output, str, strlen (str), NULL, NULL); g_free (str); @@ -255,7 +255,7 @@ write_theme_to_disk (GnomeThemeMetaInfo *theme_info, g_object_unref (client); } - g_file_move (tmp_file, target_file, G_FILE_COPY_NONE, NULL, NULL, NULL, NULL); + g_file_move (tmp_file, target_file, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, NULL); g_output_stream_close (output, NULL, NULL); g_object_unref (tmp_file);