[gimp] Bug 771484 - text loading impossible, in version commit 4b4e1c8

[Michael Natterer <mitch src gnome org>]

commit 3ee5df9ee89d6ae24c9c7e83d21459af4387f344
Author: Michael Natterer <mitch gimp org>
Date:   Thu Sep 15 14:48:51 2016 +0200

    Bug 771484 - text loading impossible, in version commit 4b4e1c8
    
    gimp_restore(): the call to gimp_fonts_load() got lost in
    commit 64a2c395d1621486e0a735a1152f5cc3733d6270.
    
    Also adjust init progress percentages again.

 app/core/gimp-data-factories.c |    7 ++++---
 app/core/gimp.c                |    5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/app/core/gimp-data-factories.c b/app/core/gimp-data-factories.c
index ab15b48..6adf49f 100644
--- a/app/core/gimp-data-factories.c
+++ b/app/core/gimp-data-factories.c
@@ -355,12 +355,12 @@ gimp_data_factories_load (Gimp               *gimp,
                                gimp->no_data);
 
   /*  initialize the list of gimp dynamics   */
-  status_callback (NULL, _("Dynamics"), 0.2);
+  status_callback (NULL, _("Dynamics"), 0.15);
   gimp_data_factory_data_init (gimp->dynamics_factory, gimp->user_context,
                                gimp->no_data);
 
   /*  initialize the list of mypaint brushes    */
-  status_callback (NULL, _("MyPaint Brushes"), 0.25);
+  status_callback (NULL, _("MyPaint Brushes"), 0.2);
   gimp_data_factory_data_init (gimp->mybrush_factory, gimp->user_context,
                                gimp->no_data);
 
@@ -380,6 +380,7 @@ gimp_data_factories_load (Gimp               *gimp,
                                gimp->no_data);
 
   /*  initialize the color history   */
+  status_callback (NULL, _("Color History"), 0.55);
   gimp_palettes_load (gimp);
 
   /*  initialize the list of gimp tool presets if we have a GUI  */
@@ -391,7 +392,7 @@ gimp_data_factories_load (Gimp               *gimp,
     }
 
   /* update tag cache */
-  status_callback (NULL, _("Updating tag cache"), 0.7);
+  status_callback (NULL, _("Updating tag cache"), 0.65);
   gimp_tag_cache_load (gimp->tag_cache);
   gimp_tag_cache_add_container (gimp->tag_cache,
                                 gimp_data_factory_get_container (gimp->brush_factory));
diff --git a/app/core/gimp.c b/app/core/gimp.c
index bcf8109..7d22b95 100644
--- a/app/core/gimp.c
+++ b/app/core/gimp.c
@@ -847,6 +847,11 @@ gimp_restore (Gimp               *gimp,
   /*  initialize the lists of gimp brushes, dynamics, patterns etc.  */
   gimp_data_factories_load (gimp, status_callback);
 
+  /*  initialize the list of fonts  */
+  status_callback (NULL, _("Fonts (this may take a while)"), 0.7);
+  if (! gimp->no_fonts)
+    gimp_fonts_load (gimp, status_callback);
+
   /*  initialize the template list  */
   status_callback (NULL, _("Templates"), 0.8);
   gimp_templates_load (gimp);