[gimp] app, libgimpbase: completely remove enum value GIMP_NO_FILL
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app, libgimpbase: completely remove enum value GIMP_NO_FILL
- Date: Tue, 13 May 2014 14:32:57 +0000 (UTC)
commit 454d5d954bcac27b369253a1bbcc053ab9f198a9
Author: Michael Natterer <mitch gimp org>
Date: Tue May 13 16:30:02 2014 +0200
app, libgimpbase: completely remove enum value GIMP_NO_FILL
It should not have been moved to libgimpbase, it was never
PDB-exported and not selectable in the GUI any longer, so its code
paths were dead.
app/core/gimp-edit.c | 3 ---
app/core/gimpdrawable.c | 3 ---
app/core/gimptemplate.c | 2 +-
libgimpbase/gimpbaseenums.c | 2 --
libgimpbase/gimpbaseenums.h | 3 +--
5 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c
index ff26b25..f5d5a0f 100644
--- a/app/core/gimp-edit.c
+++ b/app/core/gimp-edit.c
@@ -463,9 +463,6 @@ gimp_edit_fill (GimpImage *image,
undo_desc = C_("undo-type", "Fill with Pattern");
break;
- case GIMP_NO_FILL:
- return TRUE; /* nothing to do, but the fill succeeded */
-
default:
g_warning ("%s: unknown fill type", G_STRFUNC);
return gimp_edit_fill (image, drawable,
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index ab1dcdb..90a0498 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -1558,9 +1558,6 @@ gimp_drawable_fill_by_type (GimpDrawable *drawable,
pattern = gimp_context_get_pattern (context);
break;
- case GIMP_NO_FILL:
- return;
-
default:
g_warning ("%s: unknown fill type %d", G_STRFUNC, fill_type);
return;
diff --git a/app/core/gimptemplate.c b/app/core/gimptemplate.c
index 02b6f00..2adb254 100644
--- a/app/core/gimptemplate.c
+++ b/app/core/gimptemplate.c
@@ -470,7 +470,7 @@ gimp_template_get_precision (GimpTemplate *template)
GimpFillType
gimp_template_get_fill_type (GimpTemplate *template)
{
- g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_NO_FILL);
+ g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_BACKGROUND_FILL);
return GET_PRIVATE (template)->fill_type;
}
diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c
index 071ec22..e62f127 100644
--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -458,7 +458,6 @@ gimp_fill_type_get_type (void)
{ GIMP_WHITE_FILL, "GIMP_WHITE_FILL", "white-fill" },
{ GIMP_TRANSPARENT_FILL, "GIMP_TRANSPARENT_FILL", "transparent-fill" },
{ GIMP_PATTERN_FILL, "GIMP_PATTERN_FILL", "pattern-fill" },
- { GIMP_NO_FILL, "GIMP_NO_FILL", "no-fill" },
{ 0, NULL, NULL }
};
@@ -469,7 +468,6 @@ gimp_fill_type_get_type (void)
{ GIMP_WHITE_FILL, NC_("fill-type", "White"), NULL },
{ GIMP_TRANSPARENT_FILL, NC_("fill-type", "Transparency"), NULL },
{ GIMP_PATTERN_FILL, NC_("fill-type", "Pattern"), NULL },
- { GIMP_NO_FILL, NC_("fill-type", "None"), NULL },
{ 0, NULL, NULL }
};
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index 49d071b..815c427 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -250,8 +250,7 @@ typedef enum
GIMP_BACKGROUND_FILL, /*< desc="Background color" >*/
GIMP_WHITE_FILL, /*< desc="White" >*/
GIMP_TRANSPARENT_FILL, /*< desc="Transparency" >*/
- GIMP_PATTERN_FILL, /*< desc="Pattern" >*/
- GIMP_NO_FILL /*< desc="None", pdb-skip >*/
+ GIMP_PATTERN_FILL /*< desc="Pattern" >*/
} GimpFillType;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]