[gimp/goat-invasion] === squash me into previous ===

[Michael Natterer <mitch src gnome org>]

commit 3f5daf358b937106dcc0bc49dca5c15dcc5907e4
Author: Michael Natterer <mitch gimp org>
Date:   Sat Mar 24 18:26:51 2012 +0100

    === squash me into previous ===

 app/gegl/gimp-gegl.c                   |    2 ++
 app/gegl/gimpoperationnormalmode.c     |   13 ++++++-------
 app/gegl/gimpoperationpointlayermode.c |    5 +++--
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/app/gegl/gimp-gegl.c b/app/gegl/gimp-gegl.c
index f714888..a938198 100644
--- a/app/gegl/gimp-gegl.c
+++ b/app/gegl/gimp-gegl.c
@@ -47,6 +47,7 @@
 #include "gimpoperationthreshold.h"
 
 #include "gimpoperationpointlayermode.h"
+#include "gimpoperationnormalmode.h"
 #include "gimpoperationdissolvemode.h"
 #include "gimpoperationbehindmode.h"
 #include "gimpoperationmultiplymode.h"
@@ -132,6 +133,7 @@ gimp_gegl_init (Gimp *gimp)
   g_type_class_ref (GIMP_TYPE_OPERATION_THRESHOLD);
 
   g_type_class_ref (GIMP_TYPE_OPERATION_POINT_LAYER_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_NORMAL_MODE);
   g_type_class_ref (GIMP_TYPE_OPERATION_DISSOLVE_MODE);
   g_type_class_ref (GIMP_TYPE_OPERATION_BEHIND_MODE);
   g_type_class_ref (GIMP_TYPE_OPERATION_MULTIPLY_MODE);
diff --git a/app/gegl/gimpoperationnormalmode.c b/app/gegl/gimpoperationnormalmode.c
index 9bd170e..2dd5bae 100644
--- a/app/gegl/gimpoperationnormalmode.c
+++ b/app/gegl/gimpoperationnormalmode.c
@@ -75,7 +75,8 @@ gimp_operation_normal_parent_process (GeglOperation        *operation,
 {
   const GeglRectangle *in_extent  = NULL;
   const GeglRectangle *aux_extent = NULL;
-  gpointer             input, aux;
+  GObject             *input;
+  GObject             *aux;
 
   /* get the raw values this does not increase the reference count */
   input = gegl_operation_context_get_object (context, "input");
@@ -85,24 +86,22 @@ gimp_operation_normal_parent_process (GeglOperation        *operation,
    * overlapping
    */
   if (input)
-    in_extent = gegl_buffer_get_abyss (input);
+    in_extent = gegl_buffer_get_abyss (GEGL_BUFFER (input));
 
   if (! input ||
       (aux && ! gegl_rectangle_intersect (NULL, in_extent, result)))
     {
-      gegl_operation_context_take_object (context, "output",
-                                          g_object_ref (aux));
+      gegl_operation_context_set_object (context, "output", aux);
       return TRUE;
     }
 
   if (aux)
-    aux_extent = gegl_buffer_get_abyss (aux);
+    aux_extent = gegl_buffer_get_abyss (GEGL_BUFFER (aux));
 
   if (! aux ||
       (input && ! gegl_rectangle_intersect (NULL, aux_extent, result)))
     {
-      gegl_operation_context_take_object (context, "output",
-                                          g_object_ref (input));
+      gegl_operation_context_set_object (context, "output", input);
       return TRUE;
     }
 
diff --git a/app/gegl/gimpoperationpointlayermode.c b/app/gegl/gimpoperationpointlayermode.c
index b463136..d640a9e 100644
--- a/app/gegl/gimpoperationpointlayermode.c
+++ b/app/gegl/gimpoperationpointlayermode.c
@@ -124,7 +124,8 @@ gimp_operation_point_layer_mode_class_init (GimpOperationPointLayerModeClass *kl
                                    g_param_spec_enum ("blend-mode", NULL, NULL,
                                                       GIMP_TYPE_LAYER_MODE_EFFECTS,
                                                       GIMP_NORMAL_MODE,
-                                                      GIMP_PARAM_READWRITE));
+                                                      GIMP_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT));
 
   g_object_class_install_property (object_class, PROP_PREMULTIPLIED,
                                    g_param_spec_boolean ("premultiplied",
@@ -159,7 +160,7 @@ gimp_operation_point_layer_mode_set_property (GObject      *object,
       break;
 
     case PROP_PREMULTIPLIED:
-      self->premultiplied = g_value_get_enum (value);
+      self->premultiplied = g_value_get_boolean (value);
       break;
 
     default: