[gimp/gimp-2-8] Bug 684945 - Export can incorrectly default to changing format...

[Michael Natterer <mitch src gnome org>]

commit 7deac97a9a81637884d96a17f8263d3c39c5a337
Author: Michael Natterer <mitch gimp org>
Date:   Tue Oct 2 23:07:11 2012 +0200

    Bug 684945 - Export can incorrectly default to changing format...
    
    Fix default export extension to be as specified:
    
    1. last export of this image
    2. imported extension
    3. last export of any image
    4. png
    
    2 and 3 were reversed in the code.
    (cherry picked from commit aa6151d1af70b753f31bc3ba39f2f48973b8beea)

 app/widgets/gimpfiledialog.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c
index 30916ef..861e118 100644
--- a/app/widgets/gimpfiledialog.c
+++ b/app/widgets/gimpfiledialog.c
@@ -636,17 +636,18 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
       /* Priority of default type/extension for Export:
        *
        *   1. Type of last Export
-       *   2. Type of latest Export of any document
-       *   3. Type of the image Import
+       *   2. Type of the image Import
+       *   3. Type of latest Export of any document
        *   4. .png
        */
       ext_uri = gimp_image_get_exported_uri (image);
 
       if (! ext_uri)
+        ext_uri = gimp_image_get_imported_uri (image);
+
+      if (! ext_uri)
         ext_uri = g_object_get_data (G_OBJECT (gimp),
                                      GIMP_FILE_EXPORT_LAST_URI_KEY);
-      if (! ext_uri)
-        ext_uri = gimp_image_get_imported_uri (image);
 
       if (! ext_uri)
         ext_uri = "file:///we/only/care/about/extension.png";