gimp r24762 - in trunk: . app app/gegl

[neo svn gnome org]

Author: neo
Date: Thu Jan 31 19:08:53 2008
New Revision: 24762
URL: http://svn.gnome.org/viewvc/gimp?rev=24762&view=rev

Log:
2008-01-31  Sven Neumann  <sven gimp org>

	Delay GEGL initialisation until after the command-line parsing 
so
	that we can detect an already running GIMP instance and delegate
	to that without going through the GEGL and babl initialisation.
	
	* app/app.c (app_libs_init): don't add the GEGL options group
	here.  GEGL doesn't add any command-line options and it doesn't
	look as if it would do that anytime soon.

	* app/gegl/gimp-gegl.c (gimp_gegl_init): initialize GEGL here.



Modified:
   trunk/ChangeLog
   trunk/app/app.c
   trunk/app/gegl/gimp-gegl.c

Modified: trunk/app/app.c
==============================================================================
--- trunk/app/app.c	(original)
+++ trunk/app/app.c	Thu Jan 31 19:08:53 2008
@@ -32,8 +32,6 @@
 
 #include <glib-object.h>
 
-#include <gegl.h>
-
 #include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
@@ -82,8 +80,6 @@
 {
   g_type_init ();
 
-  g_option_context_add_group (context, gegl_get_option_group ());
-
 #ifndef GIMP_CONSOLE_COMPILATION
   if (! no_interface)
     {

Modified: trunk/app/gegl/gimp-gegl.c
==============================================================================
--- trunk/app/gegl/gimp-gegl.c	(original)
+++ trunk/app/gegl/gimp-gegl.c	Thu Jan 31 19:08:53 2008
@@ -41,6 +41,8 @@
 void
 gimp_gegl_init (void)
 {
+  gegl_init (NULL, NULL);
+
   g_type_class_ref (GIMP_TYPE_OPERATION_COLOR_BALANCE);
   g_type_class_ref (GIMP_TYPE_OPERATION_COLORIZE);
   g_type_class_ref (GIMP_TYPE_OPERATION_CURVES);