[gimp] app: Pass Gimp instead of GimpContext to file_save()

[Martin Nordholts <martinn src gnome org>]

commit 8064bbf22ec7527da05cb79513d8b79e71e91b6b
Author: Martin Nordholts <martinn src gnome org>
Date:   Sun May 3 08:34:39 2009 +0200

    app: Pass Gimp instead of GimpContext to file_save()
---
 app/dialogs/file-save-dialog.c |    4 ++--
 app/file/file-save.c           |    9 +++++----
 app/file/file-save.h           |    4 ++--
 app/widgets/gimpdnd-xds.c      |    4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c
index 3a97b19..e2420c6 100644
--- a/app/dialogs/file-save-dialog.c
+++ b/app/dialogs/file-save-dialog.c
@@ -487,8 +487,8 @@ file_save_dialog_save_image (GimpProgress        *progress,
       gimp_action_group_set_action_sensitive (list->data, "file-quit", FALSE);
     }
 
-  status = file_save (image, gimp_get_user_context (gimp), progress,
-                      uri, save_proc, run_mode, save_a_copy, &error);
+  status = file_save (gimp, image, progress, uri,
+                      save_proc, run_mode, save_a_copy, &error);
 
   switch (status)
     {
diff --git a/app/file/file-save.c b/app/file/file-save.c
index 7a63904..840ad46 100644
--- a/app/file/file-save.c
+++ b/app/file/file-save.c
@@ -67,8 +67,8 @@
 /*  public functions  */
 
 GimpPDBStatusType
-file_save (GimpImage           *image,
-           GimpContext         *context,
+file_save (Gimp                *gimp,
+           GimpImage           *image,
            GimpProgress        *progress,
            const gchar         *uri,
            GimpPlugInProcedure *file_proc,
@@ -83,8 +83,8 @@ file_save (GimpImage           *image,
   gint32             image_ID;
   gint32             drawable_ID;
 
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), GIMP_PDB_CALLING_ERROR);
   g_return_val_if_fail (GIMP_IS_IMAGE (image), GIMP_PDB_CALLING_ERROR);
-  g_return_val_if_fail (GIMP_IS_CONTEXT (context), GIMP_PDB_CALLING_ERROR);
   g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress),
                         GIMP_PDB_CALLING_ERROR);
   g_return_val_if_fail (uri != NULL, GIMP_PDB_CALLING_ERROR);
@@ -135,7 +135,8 @@ file_save (GimpImage           *image,
 
   return_vals =
     gimp_pdb_execute_procedure_by_name (image->gimp->pdb,
-                                        context, progress, error,
+                                        gimp_get_user_context (gimp),
+                                        progress, error,
                                         GIMP_OBJECT (file_proc)->name,
                                         GIMP_TYPE_INT32,       run_mode,
                                         GIMP_TYPE_IMAGE_ID,    image_ID,
diff --git a/app/file/file-save.h b/app/file/file-save.h
index 544ad0f..d4ce829 100644
--- a/app/file/file-save.h
+++ b/app/file/file-save.h
@@ -21,8 +21,8 @@
 #define __FILE_SAVE_H__
 
 
-GimpPDBStatusType   file_save (GimpImage            *image,
-                               GimpContext          *context,
+GimpPDBStatusType   file_save (Gimp                 *gimp,
+                               GimpImage            *image,
                                GimpProgress         *progress,
                                const gchar          *uri,
                                GimpPlugInProcedure  *file_proc,
diff --git a/app/widgets/gimpdnd-xds.c b/app/widgets/gimpdnd-xds.c
index d5021cc..45dabaa 100644
--- a/app/widgets/gimpdnd-xds.c
+++ b/app/widgets/gimpdnd-xds.c
@@ -152,8 +152,8 @@ gimp_dnd_xds_save_image (GdkDragContext   *context,
           ! g_file_test (filename, G_FILE_TEST_EXISTS) ||
           gimp_file_overwrite_dialog (NULL, uri))
         {
-          if (file_save (image,
-                         gimp_get_user_context (image->gimp), NULL,
+          if (file_save (image->gimp,
+                         image, NULL,
                          uri, proc, GIMP_RUN_INTERACTIVE, FALSE,
                          &error) == GIMP_PDB_SUCCESS)
             {