[gimp] app: fix copy/paste GError bug in some calls to g_file_replace()



commit a572638656db58578dcc812ac18cf88775a3a8b8
Author: Michael Natterer <mitch gimp org>
Date:   Thu Jul 3 13:01:01 2014 +0200

    app: fix copy/paste GError bug in some calls to g_file_replace()

 app/core/gimpbrushgenerated-save.c |    2 +-
 app/core/gimpgradient-save.c       |    4 ++--
 app/core/gimppalette-save.c        |    2 +-
 app/operations/gimpcurvesconfig.c  |    2 +-
 app/operations/gimplevelsconfig.c  |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/app/core/gimpbrushgenerated-save.c b/app/core/gimpbrushgenerated-save.c
index d7c7fcf..25d6bbb 100644
--- a/app/core/gimpbrushgenerated-save.c
+++ b/app/core/gimpbrushgenerated-save.c
@@ -49,7 +49,7 @@ gimp_brush_generated_save (GimpData  *data,
 
   output = G_OUTPUT_STREAM (g_file_replace (gimp_data_get_file (data),
                                             NULL, FALSE, G_FILE_CREATE_NONE,
-                                            NULL, error));
+                                            NULL, &my_error));
   if (! output)
     {
       g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
diff --git a/app/core/gimpgradient-save.c b/app/core/gimpgradient-save.c
index 8e4bf93..35fbbc5 100644
--- a/app/core/gimpgradient-save.c
+++ b/app/core/gimpgradient-save.c
@@ -44,7 +44,7 @@ gimp_gradient_save (GimpData  *data,
 
   output = G_OUTPUT_STREAM (g_file_replace (gimp_data_get_file (data),
                                             NULL, FALSE, G_FILE_CREATE_NONE,
-                                            NULL, error));
+                                            NULL, &my_error));
   if (! output)
     {
       g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
@@ -160,7 +160,7 @@ gimp_gradient_save_pov (GimpGradient  *gradient,
 
   output = G_OUTPUT_STREAM (g_file_replace (file,
                                             NULL, FALSE, G_FILE_CREATE_NONE,
-                                            NULL, error));
+                                            NULL, &my_error));
   if (! output)
     {
       g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
diff --git a/app/core/gimppalette-save.c b/app/core/gimppalette-save.c
index 1978ea2..d0a40c9 100644
--- a/app/core/gimppalette-save.c
+++ b/app/core/gimppalette-save.c
@@ -45,7 +45,7 @@ gimp_palette_save (GimpData  *data,
 
   output = G_OUTPUT_STREAM (g_file_replace (gimp_data_get_file (data),
                                             NULL, FALSE, G_FILE_CREATE_NONE,
-                                            NULL, error));
+                                            NULL, &my_error));
   if (! output)
     {
       g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
diff --git a/app/operations/gimpcurvesconfig.c b/app/operations/gimpcurvesconfig.c
index fd581b0..fdb6085 100644
--- a/app/operations/gimpcurvesconfig.c
+++ b/app/operations/gimpcurvesconfig.c
@@ -587,7 +587,7 @@ gimp_curves_config_save_cruft (GimpCurvesConfig  *config,
 
   output = G_OUTPUT_STREAM (g_file_replace (file,
                                             NULL, FALSE, G_FILE_CREATE_NONE,
-                                            NULL, error));
+                                            NULL, &my_error));
   if (! output)
     {
       g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
diff --git a/app/operations/gimplevelsconfig.c b/app/operations/gimplevelsconfig.c
index 167951f..0ad84a4 100644
--- a/app/operations/gimplevelsconfig.c
+++ b/app/operations/gimplevelsconfig.c
@@ -830,7 +830,7 @@ gimp_levels_config_save_cruft (GimpLevelsConfig  *config,
 
   output = G_OUTPUT_STREAM (g_file_replace (file,
                                             NULL, FALSE, G_FILE_CREATE_NONE,
-                                            NULL, error));
+                                            NULL, &my_error));
   if (! output)
     {
       g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]