gimp r25524 - in trunk: . app app/gegl

[neo svn gnome org]

Author: neo
Date: Fri Apr 25 11:44:00 2008
New Revision: 25524
URL: http://svn.gnome.org/viewvc/gimp?rev=25524&view=rev

Log:
2008-04-25  Sven Neumann  <sven gimp org>

	* app/app.c
	* app/gegl/gimp-gegl.c: reverted change from 2008-01-31. Use the
	GEGL option group again now that GEGL provides some commmand-line
	options.


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	Fri Apr 25 11:44:00 2008
@@ -32,6 +32,8 @@
 
 #include <gegl.h>
 
+#include <gegl.h>
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
@@ -80,6 +82,8 @@
 {
   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	Fri Apr 25 11:44:00 2008
@@ -41,8 +41,6 @@
 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);