From 26a744f44d031f6748112ceb8740ab33e5d3585d Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Tue, 10 Sep 2019 19:36:54 +0200
Subject: [PATCH] plug-ins: register thumbnail procedures before load
 procedures

so registering the thumbnail loader with the load procedure can
perform some checks for procedure existence and signature.
---
 plug-ins/common/file-gif-load.c    | 2 +-
 plug-ins/common/file-pdf-load.c    | 2 +-
 plug-ins/common/file-ps.c          | 2 +-
 plug-ins/common/file-svg.c         | 2 +-
 plug-ins/common/file-wmf.c         | 2 +-
 plug-ins/common/file-xmc.c         | 2 +-
 plug-ins/file-ico/ico.c            | 2 +-
 plug-ins/file-jpeg/jpeg.c          | 2 +-
 plug-ins/file-psd/psd.c            | 2 +-
 plug-ins/python/file-openraster.py | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plug-ins/common/file-gif-load.c b/plug-ins/common/file-gif-load.c
index d278681842..01686f126e 100644
--- a/plug-ins/common/file-gif-load.c
+++ b/plug-ins/common/file-gif-load.c
@@ -153,8 +153,8 @@ gif_query_procedures (GimpPlugIn *plug_in)
 {
   GList *list = NULL;
 
-  list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (LOAD_THUMB_PROC));
+  list = g_list_append (list, g_strdup (LOAD_PROC));
 
   return list;
 }
diff --git a/plug-ins/common/file-pdf-load.c b/plug-ins/common/file-pdf-load.c
index 93ba50d4a2..d74a7259d3 100644
--- a/plug-ins/common/file-pdf-load.c
+++ b/plug-ins/common/file-pdf-load.c
@@ -305,8 +305,8 @@ pdf_query_procedures (GimpPlugIn *plug_in)
 {
   GList *list = NULL;
 
-  list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (LOAD_THUMB_PROC));
+  list = g_list_append (list, g_strdup (LOAD_PROC));
 
   return list;
 }
diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c
index 55365d9676..ded68265fd 100644
--- a/plug-ins/common/file-ps.c
+++ b/plug-ins/common/file-ps.c
@@ -349,9 +349,9 @@ ps_query_procedures (GimpPlugIn *plug_in)
 {
   GList *list = NULL;
 
+  list = g_list_append (list, g_strdup (LOAD_PS_THUMB_PROC));
   list = g_list_append (list, g_strdup (LOAD_PS_PROC));
   list = g_list_append (list, g_strdup (LOAD_EPS_PROC));
-  list = g_list_append (list, g_strdup (LOAD_PS_THUMB_PROC));
   list = g_list_append (list, g_strdup (SAVE_PS_PROC));
   list = g_list_append (list, g_strdup (SAVE_EPS_PROC));
 
diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c
index cfaf049fa9..0740e43c28 100644
--- a/plug-ins/common/file-svg.c
+++ b/plug-ins/common/file-svg.c
@@ -135,8 +135,8 @@ svg_query_procedures (GimpPlugIn *plug_in)
 {
   GList *list = NULL;
 
-  list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (LOAD_THUMB_PROC));
+  list = g_list_append (list, g_strdup (LOAD_PROC));
 
   return list;
 }
diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c
index bebb0e7195..fad452520d 100644
--- a/plug-ins/common/file-wmf.c
+++ b/plug-ins/common/file-wmf.c
@@ -130,8 +130,8 @@ wmf_query_procedures (GimpPlugIn *plug_in)
 {
   GList *list = NULL;
 
-  list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (LOAD_THUMB_PROC));
+  list = g_list_append (list, g_strdup (LOAD_PROC));
 
   return list;
 }
diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c
index 66c6c6607b..9f7780ed29 100644
--- a/plug-ins/common/file-xmc.c
+++ b/plug-ins/common/file-xmc.c
@@ -313,8 +313,8 @@ xmc_query_procedures (GimpPlugIn *plug_in)
 {
   GList *list = NULL;
 
-  list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (LOAD_THUMB_PROC));
+  list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (SAVE_PROC));
 
   return list;
diff --git a/plug-ins/file-ico/ico.c b/plug-ins/file-ico/ico.c
index 376a0b1603..ddd56bbf2f 100644
--- a/plug-ins/file-ico/ico.c
+++ b/plug-ins/file-ico/ico.c
@@ -104,8 +104,8 @@ ico_query_procedures (GimpPlugIn *plug_in)
 {
   GList *list = NULL;
 
-  list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (LOAD_THUMB_PROC));
+  list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (SAVE_PROC));
 
   return list;
diff --git a/plug-ins/file-jpeg/jpeg.c b/plug-ins/file-jpeg/jpeg.c
index a24cf8687c..f38347e8b1 100644
--- a/plug-ins/file-jpeg/jpeg.c
+++ b/plug-ins/file-jpeg/jpeg.c
@@ -113,8 +113,8 @@ jpeg_query_procedures (GimpPlugIn *plug_in)
 {
   GList *list = NULL;
 
-  list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (LOAD_THUMB_PROC));
+  list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (SAVE_PROC));
 
   return list;
diff --git a/plug-ins/file-psd/psd.c b/plug-ins/file-psd/psd.c
index 15e65131a5..0b9c71fcaf 100644
--- a/plug-ins/file-psd/psd.c
+++ b/plug-ins/file-psd/psd.c
@@ -99,9 +99,9 @@ psd_query_procedures (GimpPlugIn *plug_in)
 {
   GList *list = NULL;
 
+  list = g_list_append (list, g_strdup (LOAD_THUMB_PROC));
   list = g_list_append (list, g_strdup (LOAD_PROC));
   list = g_list_append (list, g_strdup (LOAD_MERGED_PROC));
-  list = g_list_append (list, g_strdup (LOAD_THUMB_PROC));
   list = g_list_append (list, g_strdup (SAVE_PROC));
 
   return list;
diff --git a/plug-ins/python/file-openraster.py b/plug-ins/python/file-openraster.py
index ba62f531bc..7b292721d7 100755
--- a/plug-ins/python/file-openraster.py
+++ b/plug-ins/python/file-openraster.py
@@ -357,9 +357,9 @@ class FileOpenRaster (Gimp.PlugIn):
         self.set_translation_domain("gimp30-python",
                                     Gio.file_new_for_path(Gimp.locale_directory()))
 
-        return [ 'file-openraster-save',
+        return [ 'file-openraster-load-thumb',
                  'file-openraster-load',
-                 'file-openraster-load-thumb' ]
+                 'file-openraster-save' ]
 
     def do_create_procedure(self, name):
         if name == 'file-openraster-save':