[gimp] app: move the call to gimp_gegl_init() to gimp_real_initialize()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: move the call to gimp_gegl_init() to gimp_real_initialize()
- Date: Thu, 10 Nov 2016 23:49:18 +0000 (UTC)
commit 99c040095d2a316a28f3a84a76ee76c1ccaf15b2
Author: Michael Natterer <mitch gimp org>
Date: Fri Nov 11 00:48:30 2016 +0100
app: move the call to gimp_gegl_init() to gimp_real_initialize()
app/app.c | 5 -----
app/core/gimp.c | 8 +++++++-
2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/app/app.c b/app/app.c
index 3573d4e..e3c1336 100644
--- a/app/app.c
+++ b/app/app.c
@@ -45,8 +45,6 @@
#include "config/gimprc.h"
-#include "gegl/gimp-gegl.h"
-
#include "core/gimp.h"
#include "core/gimp-batch.h"
#include "core/gimp-user-install.h"
@@ -254,9 +252,6 @@ app_run (const gchar *full_prog_name,
if (! update_status_func)
update_status_func = app_init_update_noop;
- /* initialize lowlevel stuff */
- gimp_gegl_init (gimp);
-
/* Create all members of the global Gimp instance which need an already
* parsed gimprc, e.g. the data factories
*/
diff --git a/app/core/gimp.c b/app/core/gimp.c
index db57d56..2fbf390 100644
--- a/app/core/gimp.c
+++ b/app/core/gimp.c
@@ -29,6 +29,8 @@
#include "config/gimprc.h"
+#include "gegl/gimp-gegl.h"
+
#include "pdb/gimppdb.h"
#include "pdb/gimp-pdb-compat.h"
#include "pdb/internal-procs.h"
@@ -584,9 +586,13 @@ gimp_real_initialize (Gimp *gimp,
status_callback (_("Initialization"), NULL, 0.0);
+ /* initialize GEGL and babl */
+ status_callback (NULL, "GEGL", 0.1);
+ gimp_gegl_init (gimp);
+
gimp_fonts_set_config (gimp);
- /* Set the last values used to default values. */
+ /* set the last values used to default values */
gimp->image_new_last_template =
gimp_config_duplicate (GIMP_CONFIG (gimp->config->default_image));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]