[gimp/gimp-2-10] app: improve file-handler sorting

[Ell <ell src gnome org>]

commit 65daaeb876b51213432ee3b9c157c89eb0332553
Author: Ell <ell_se yahoo com>
Date:   Wed Jul 18 09:25:05 2018 -0400

    app: improve file-handler sorting
    
    ... by falling back to the procedure name as a last resort.
    
    (cherry picked from commit 534e8aa92c2c0beae2273dfa81baaae04faf9ab6)

 app/plug-in/gimppluginmanager-restore.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/app/plug-in/gimppluginmanager-restore.c b/app/plug-in/gimppluginmanager-restore.c
index 2748e8c2f8..a1f37ec18b 100644
--- a/app/plug-in/gimppluginmanager-restore.c
+++ b/app/plug-in/gimppluginmanager-restore.c
@@ -1020,7 +1020,6 @@ gimp_plug_in_manager_file_proc_compare (gconstpointer a,
   gboolean             display = GPOINTER_TO_INT (data);
   const gchar         *label_a;
   const gchar         *label_b;
-  gint                 retval  = 0;
 
   if (g_str_has_prefix (gimp_file_get_utf8_name (proc_a->file),
                                                  "gimp-xcf"))
@@ -1046,18 +1045,21 @@ gimp_plug_in_manager_file_proc_compare (gconstpointer a,
   if (label_a)
     {
       if (label_b)
-        retval = g_utf8_collate (label_a, label_b);
+        {
+          gint comp = g_utf8_collate (label_a, label_b);
+
+          if (comp)
+            return comp;
+        }
       else
-        return -1;
+        {
+          return -1;
+        }
     }
   else if (label_b)
     {
       return 1;
     }
-  else
-    {
-      retval = (proc_b < proc_a) - (proc_a < proc_b);
-    }
 
-  return retval;
+  return strcmp (gimp_object_get_name (proc_a), gimp_object_get_name (proc_b));
 }