gegl r2307 - in trunk: . bin

[ok svn gnome org]

Author: ok
Date: Sat May 17 20:01:24 2008
New Revision: 2307
URL: http://svn.gnome.org/viewvc/gegl?rev=2307&view=rev

Log:
* bin/gegl-options.[ch]: moved GeglOptions typedef to .h file.
* bin/gegl-bin-types.h: removed.
* bin/gegl-options.h:
* bin/editor.h:
* bin/gegl.c: (main):
* bin/gegl-bin-gui-types.h: simplified.


Removed:
   trunk/bin/gegl-bin-types.h
Modified:
   trunk/ChangeLog
   trunk/bin/editor.h
   trunk/bin/gegl-bin-gui-types.h
   trunk/bin/gegl-options.c
   trunk/bin/gegl-options.h
   trunk/bin/gegl.c

Modified: trunk/bin/editor.h
==============================================================================
--- trunk/bin/editor.h	(original)
+++ trunk/bin/editor.h	Sat May 17 20:01:24 2008
@@ -19,6 +19,8 @@
 #ifndef EDITOR_H
 #define EDITOR_H
 
+#include "gegl-options.h"
+
 struct _Editor 
 {
   GeglNode    *gegl;

Modified: trunk/bin/gegl-bin-gui-types.h
==============================================================================
--- trunk/bin/gegl-bin-gui-types.h	(original)
+++ trunk/bin/gegl-bin-gui-types.h	Sat May 17 20:01:24 2008
@@ -19,8 +19,6 @@
 #define GEGL_BIN_GUI_TYPES_H
 
 
-#include "gegl-bin-types.h"
-
 
 typedef struct _Editor          Editor;
 typedef struct _GeglNodeEditor  GeglNodeEditor;

Modified: trunk/bin/gegl-options.c
==============================================================================
--- trunk/bin/gegl-options.c	(original)
+++ trunk/bin/gegl-options.c	Sat May 17 20:01:24 2008
@@ -22,11 +22,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "gegl-bin-types.h"
-
 #include "gegl-options.h"
 
-
 static GeglOptions *opts_new (void)
 {
   GeglOptions *o = g_malloc0 (sizeof (GeglOptions));

Modified: trunk/bin/gegl-options.h
==============================================================================
--- trunk/bin/gegl-options.h	(original)
+++ trunk/bin/gegl-options.h	Sat May 17 20:01:24 2008
@@ -30,6 +30,8 @@
   GEGL_RUN_MODE_XML
 } GeglRunMode;
 
+typedef struct _GeglOptions GeglOptions;
+
 struct _GeglOptions
 {
   GeglRunMode  mode;

Modified: trunk/bin/gegl.c
==============================================================================
--- trunk/bin/gegl.c	(original)
+++ trunk/bin/gegl.c	Sat May 17 20:01:24 2008
@@ -27,8 +27,6 @@
 #include <unistd.h>
 #endif
 
-#include "gegl-bin-types.h"
-
 #include "gegl-options.h"
 #include "gegl-dot.h"
 
@@ -79,10 +77,8 @@
   GError      *err      = NULL;
   gchar       *path_root = NULL;
 
-  gegl_init (&argc, &argv);
-
   o = gegl_options_parse (argc, argv);
-
+  gegl_init (&argc, &argv);
 
   if (o->xml)
     {