[gimp/soc-2010-cage] Bug 622683 - file export defaults to the wrong directory / folder

[Michael Muré <mmure src gnome org>]

commit 93c1fa61dc534eb6264dcb12a59a8db30bd27b25
Author: Martin Nordholts <martinn src gnome org>
Date:   Sun Jun 27 14:10:59 2010 +0200

    Bug 622683 - file export defaults to the wrong directory / folder
    
    We were not in sync with the spec:
    http://gui.gimp.org/index.php/Save_%2B_export_specification#exporting_files

 app/widgets/gimpfiledialog.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c
index ce0eea5..554c35b 100644
--- a/app/widgets/gimpfiledialog.c
+++ b/app/widgets/gimpfiledialog.c
@@ -584,10 +584,10 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
        * Priority of default paths for Export:
        *
        *   1. Last Export path
-       *   2. Last Export path of any document
-       *   3. Path of import source
-       *   4. Path of XCF source
-       *   5. Last path of any save to XCF
+       *   2. Path of import source
+       *   3. Path of XCF source
+       *   4. Last path of any save to XCF
+       *   5. Last Export path of any document
        *   6. The OS 'Documents' path
        */
 
@@ -595,10 +595,6 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
                                    GIMP_FILE_EXPORT_URI_KEY);
 
       if (! dir_uri)
-        dir_uri = g_object_get_data (G_OBJECT (gimp),
-                                     GIMP_FILE_EXPORT_LAST_URI_KEY);
-
-      if (! dir_uri)
         dir_uri = g_object_get_data (G_OBJECT (image),
                                      "gimp-image-source-uri");
 
@@ -614,6 +610,10 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
                                      GIMP_FILE_SAVE_LAST_URI_KEY);
 
       if (! dir_uri)
+        dir_uri = g_object_get_data (G_OBJECT (gimp),
+                                     GIMP_FILE_EXPORT_LAST_URI_KEY);
+
+      if (! dir_uri)
         dir_uri = docs_uri;