gegl r2541 - in trunk: . operations/common operations/external

[neo svn gnome org]

Author: neo
Date: Tue Jul 29 10:10:30 2008
New Revision: 2541
URL: http://svn.gnome.org/viewvc/gegl?rev=2541&view=rev

Log:
2008-07-29  Sven Neumann  <sven gimp org>

	* operations/common/layer.c
	* operations/common/load-buffer.c
	* operations/common/load.c
	* operations/common/mblur.c
	* operations/common/open-buffer.c
	* operations/common/rectangle.c
	* operations/external/ff-load.c
	* operations/external/text.c
	* operations/external/v4l.c: use chant_parent_class instead of
	doing the g_type_class_peek_parent() dance.



Modified:
   trunk/ChangeLog
   trunk/operations/common/layer.c
   trunk/operations/common/load-buffer.c
   trunk/operations/common/load.c
   trunk/operations/common/mblur.c
   trunk/operations/common/open-buffer.c
   trunk/operations/common/rectangle.c
   trunk/operations/external/ff-load.c
   trunk/operations/external/text.c
   trunk/operations/external/v4l.c

Modified: trunk/operations/common/layer.c
==============================================================================
--- trunk/operations/common/layer.c	(original)
+++ trunk/operations/common/layer.c	Tue Jul 29 10:10:30 2008
@@ -214,11 +214,11 @@
   GeglChant *self = GEGL_CHANT (object);
 
   if (self->cached_path)
-      g_free (self->cached_path);
+    g_free (self->cached_path);
   if (self->p_composite_op)
-      g_free (self->p_composite_op);
+    g_free (self->p_composite_op);
 
-  G_OBJECT_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS (object)))->finalize (object);
+  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/operations/common/load-buffer.c
==============================================================================
--- trunk/operations/common/load-buffer.c	(original)
+++ trunk/operations/common/load-buffer.c	Tue Jul 29 10:10:30 2008
@@ -74,7 +74,7 @@
       o->buffer = NULL;
     }
 
-  G_OBJECT_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS (object)))->dispose (object);
+  G_OBJECT_CLASS (chant_parent_class)->dispose (object);
 }
 
 

Modified: trunk/operations/common/load.c
==============================================================================
--- trunk/operations/common/load.c	(original)
+++ trunk/operations/common/load.c	Tue Jul 29 10:10:30 2008
@@ -152,30 +152,20 @@
       self->cached_path = NULL;
     }
 
-  G_OBJECT_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS (object)))->dispose (object);
+  G_OBJECT_CLASS (chant_parent_class)->dispose (object);
 }
 
 static void
-finalize (GObject *object)
-{
-  G_OBJECT_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS (object)))->finalize (object);
-}
-
-
-static void
 gegl_chant_class_init (GeglChantClass *klass)
 {
-  GeglOperationClass     *operation_class;
-  GObjectClass           *object_class;
+  GObjectClass       *object_class    = G_OBJECT_CLASS (klass);
+  GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
 
-  operation_class = GEGL_OPERATION_CLASS (klass);
-  object_class    = G_OBJECT_CLASS (klass);
+  object_class->dispose = dispose;
 
   operation_class->attach = attach;
   operation_class->detect = detect;
   operation_class->prepare = prepare;
-  G_OBJECT_CLASS (klass)->dispose = dispose;
-  G_OBJECT_CLASS (klass)->finalize = finalize;
 
   operation_class->name        = "load";
   operation_class->categories  = "meta:input";

Modified: trunk/operations/common/mblur.c
==============================================================================
--- trunk/operations/common/mblur.c	(original)
+++ trunk/operations/common/mblur.c	Tue Jul 29 10:10:30 2008
@@ -115,7 +115,7 @@
       o->chant_data = NULL;
     }
 
-  G_OBJECT_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS (object)))->finalize (object);
+  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
 }
 
 

Modified: trunk/operations/common/open-buffer.c
==============================================================================
--- trunk/operations/common/open-buffer.c	(original)
+++ trunk/operations/common/open-buffer.c	Tue Jul 29 10:10:30 2008
@@ -101,7 +101,7 @@
       o->chant_data = NULL;
     }
 
-  G_OBJECT_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS (object)))->dispose (object);
+  G_OBJECT_CLASS (chant_parent_class)->dispose (object);
 }
 
 
@@ -114,12 +114,12 @@
   operation_class = GEGL_OPERATION_CLASS (klass);
   source_class    = GEGL_OPERATION_SOURCE_CLASS (klass);
 
+  G_OBJECT_CLASS (klass)->dispose = dispose;
+
   operation_class->process = process;
   operation_class->get_bounding_box = get_bounding_box;
   operation_class->get_cached_region = get_cached_region;
 
-  G_OBJECT_CLASS (klass)->dispose = dispose;
-
   operation_class->name        = "open-buffer";
   operation_class->categories  = "input";
   operation_class->description = "A source that uses an on-disk GeglBuffer.";

Modified: trunk/operations/common/rectangle.c
==============================================================================
--- trunk/operations/common/rectangle.c	(original)
+++ trunk/operations/common/rectangle.c	Tue Jul 29 10:10:30 2008
@@ -114,14 +114,6 @@
 }
 
 static void
-finalize (GObject *object)
-{
-  /*GeglChant *self = GEGL_CHANT (object);*/
-
-  G_OBJECT_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS (object)))->finalize (object);
-}
-
-static void
 gegl_chant_class_init (GeglChantClass *klass)
 {
   GObjectClass       *object_class;
@@ -130,8 +122,6 @@
   object_class    = G_OBJECT_CLASS (klass);
   operation_class = GEGL_OPERATION_CLASS (klass);
 
-  object_class->finalize = finalize;
-
   operation_class->name        = "rectangle";
   operation_class->categories  = "input";
   operation_class->description = "A rectangular source of a fixed size with a solid color";

Modified: trunk/operations/external/ff-load.c
==============================================================================
--- trunk/operations/external/ff-load.c	(original)
+++ trunk/operations/external/ff-load.c	Tue Jul 29 10:10:30 2008
@@ -416,7 +416,7 @@
       o->chant_data = NULL;
     }
 
-  G_OBJECT_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS (object)))->finalize (object);
+  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
 }
 
 

Modified: trunk/operations/external/text.c
==============================================================================
--- trunk/operations/external/text.c	(original)
+++ trunk/operations/external/text.c	Tue Jul 29 10:10:30 2008
@@ -261,7 +261,7 @@
   if (self->cex.font)
     g_free (self->cex.font);
 
-  G_OBJECT_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS (object)))->finalize (object);
+  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/operations/external/v4l.c
==============================================================================
--- trunk/operations/external/v4l.c	(original)
+++ trunk/operations/external/v4l.c	Tue Jul 29 10:10:30 2008
@@ -182,7 +182,7 @@
       o->chant_data = NULL;
     }
 
-  G_OBJECT_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS (object)))->finalize (object);
+  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
 }
 
 static gboolean