[Xfce4-commits] <orage:master> 4.9.7.2 Fixed bug 10473 SIGABRT in orage_copy_file

[Juha Kautto]

Updating branch refs/heads/master
         to 616efbf0312e0dd2f7c5960e51843ad5a66e140f (commit)
       from 43f67230e5a5313cc17607441755f2d30149164c (commit)

commit 616efbf0312e0dd2f7c5960e51843ad5a66e140f
Author: Juha Kautto <juha at xfce.org>
Date:   Fri Nov 8 12:30:16 2013 +0200

    4.9.7.2 Fixed bug 10473 SIGABRT in orage_copy_file
    
    Did not check return code from file open. This may also fix bug 10261.
    Thanks to Steven from the patch.

 configure.in.in |    2 +-
 src/functions.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 74f2d49..c8c0971 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.9.7.1-git])
+m4_define([orage_version], [4.9.7.2-git])
 
 m4_define([gtk_minimum_version], [2.14.0])
 m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/functions.c b/src/functions.c
index 1db8093..4c7e68f 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -882,7 +882,7 @@ gboolean orage_copy_file(gchar *source, gchar *target)
         ok = FALSE;
     }
     /* write file */
-    if (!g_file_set_contents(target, text, -1, &error)) {
+    if (ok && !g_file_set_contents(target, text, -1, &error)) {
         orage_message(150, "orage_copy_file: Could not write file (%s) error:%s"
                 , target, error->message);
         g_error_free(error);