From b2cb334b47eb2133cb8b22ce7b766038bd1df98d Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 2 Jan 2019 16:18:28 +0100 Subject: [PATCH] app, libgimp: forgot to add /*< pdb-skip >*/ to enum GimpBucketFillMode so it was still exported to libgimp. --- app/core/core-enums.h | 2 +- libgimp/gimpenums.c.tail | 2 -- libgimp/gimpenums.h | 12 ------------ pdb/enums.pl | 9 --------- 4 files changed, 1 insertion(+), 24 deletions(-) diff --git a/app/core/core-enums.h b/app/core/core-enums.h index a3648b1965..2f7c53ab7c 100644 --- a/app/core/core-enums.h +++ b/app/core/core-enums.h @@ -86,7 +86,7 @@ typedef enum /*< pdb-skip >*/ GType gimp_bucket_fill_mode_get_type (void) G_GNUC_CONST; -typedef enum +typedef enum /*< pdb-skip >*/ { GIMP_BUCKET_FILL_FG, /*< desc="FG color fill" >*/ GIMP_BUCKET_FILL_BG, /*< desc="BG color fill" >*/ diff --git a/libgimp/gimpenums.c.tail b/libgimp/gimpenums.c.tail index e33a9fdbef..761c516316 100644 --- a/libgimp/gimpenums.c.tail +++ b/libgimp/gimpenums.c.tail @@ -8,7 +8,6 @@ static const GimpGetTypeFunc get_type_funcs[] = gimp_blend_mode_get_type, gimp_brush_application_mode_get_type, gimp_brush_generated_shape_get_type, - gimp_bucket_fill_mode_get_type, gimp_cap_style_get_type, gimp_channel_ops_get_type, gimp_channel_type_get_type, @@ -75,7 +74,6 @@ static const gchar * const type_names[] = "GimpBlendMode", "GimpBrushApplicationMode", "GimpBrushGeneratedShape", - "GimpBucketFillMode", "GimpCapStyle", "GimpChannelOps", "GimpChannelType", diff --git a/libgimp/gimpenums.h b/libgimp/gimpenums.h index 6d4ee93f72..6265ee81a2 100644 --- a/libgimp/gimpenums.h +++ b/libgimp/gimpenums.h @@ -35,18 +35,6 @@ typedef enum } GimpBrushApplicationMode; -#define GIMP_TYPE_BUCKET_FILL_MODE (gimp_bucket_fill_mode_get_type ()) - -GType gimp_bucket_fill_mode_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_BUCKET_FILL_FG, - GIMP_BUCKET_FILL_BG, - GIMP_BUCKET_FILL_PATTERN -} GimpBucketFillMode; - - #define GIMP_TYPE_CONVERT_DITHER_TYPE (gimp_convert_dither_type_get_type ()) GType gimp_convert_dither_type_get_type (void) G_GNUC_CONST; diff --git a/pdb/enums.pl b/pdb/enums.pl index c2ef8e46bb..8365336e73 100644 --- a/pdb/enums.pl +++ b/pdb/enums.pl @@ -843,15 +843,6 @@ package Gimp::CodeGen::enums; GIMP_LAYER_MODE_SPLIT => '60', GIMP_LAYER_MODE_PASS_THROUGH => '61' } }, - GimpBucketFillMode => - { contig => 1, - header => 'core/core-enums.h', - symbols => [ qw(GIMP_BUCKET_FILL_FG GIMP_BUCKET_FILL_BG - GIMP_BUCKET_FILL_PATTERN) ], - mapping => { GIMP_BUCKET_FILL_FG => '0', - GIMP_BUCKET_FILL_BG => '1', - GIMP_BUCKET_FILL_PATTERN => '2' } - }, GimpConvertDitherType => { contig => 1, header => 'core/core-enums.h',