From c686093b38c9c8b2517e5e73f57ed1ff93b987c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Fri, 23 Jul 2010 15:41:21 +0200
Subject: [PATCH] make GimpCageOptions to use the new enum for Cage mode

---
 app/tools/gimpcageoptions.h |  2 +-
 app/tools/tools-enums.c     | 29 -----------------------------
 app/tools/tools-enums.h     | 10 ----------
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/app/tools/gimpcageoptions.h b/app/tools/gimpcageoptions.h
index 0c9571fe5d..404a672281 100644
--- a/app/tools/gimpcageoptions.h
+++ b/app/tools/gimpcageoptions.h
@@ -21,7 +21,7 @@
 #define __GIMP_CAGE_OPTIONS_H__
 
 #include "tools/gimptransformoptions.h"
-#include "tools/tools-enums.h"
+#include "libgimpbase/gimpbase.h"
 
 
 #define GIMP_TYPE_CAGE_OPTIONS            (gimp_cage_options_get_type ())
diff --git a/app/tools/tools-enums.c b/app/tools/tools-enums.c
index b692b2ed9a..c4cf79a8d3 100644
--- a/app/tools/tools-enums.c
+++ b/app/tools/tools-enums.c
@@ -358,35 +358,6 @@ gimp_vector_mode_get_type (void)
   return type;
 }
 
-GType
-gimp_cage_mode_get_type (void)
-{
-  static const GEnumValue values[] =
-  {
-    { GIMP_CAGE_MODE_CAGE_CHANGE, "GIMP_CAGE_MODE_CAGE_CHANGE", "cage-change" },
-    { GIMP_CAGE_MODE_DEFORM, "GIMP_CAGE_MODE_DEFORM", "deform" },
-    { 0, NULL, NULL }
-  };
-
-  static const GimpEnumDesc descs[] =
-  {
-    { GIMP_CAGE_MODE_CAGE_CHANGE, NC_("cage-mode", "Create or adjust the cage"), NULL },
-    { GIMP_CAGE_MODE_DEFORM, NC_("cage-mode", "Deform the cage to deform the image"), NULL },
-    { 0, NULL, NULL }
-  };
-
-  static GType type = 0;
-
-  if (G_UNLIKELY (! type))
-    {
-      type = g_enum_register_static ("GimpCageMode", values);
-      gimp_type_set_translation_context (type, "cage-mode");
-      gimp_enum_set_value_descriptions (type, descs);
-    }
-
-  return type;
-}
-
 
 /* Generated data ends here */
 
diff --git a/app/tools/tools-enums.h b/app/tools/tools-enums.h
index 583d0c920f..874c0de5c1 100644
--- a/app/tools/tools-enums.h
+++ b/app/tools/tools-enums.h
@@ -158,16 +158,6 @@ typedef enum
 } GimpVectorMode;
 
 
-#define GIMP_TYPE_CAGE_MODE (gimp_cage_mode_get_type ())
-
-GType gimp_cage_mode_get_type (void) G_GNUC_CONST;
-
-typedef enum
-{
-  GIMP_CAGE_MODE_CAGE_CHANGE,  /*< desc="Create or adjust the cage" >*/
-  GIMP_CAGE_MODE_DEFORM    /*< desc="Deform the cage to deform the image"  >*/
-} GimpCageMode;
-
 /*
  * non-registered enums; register them if needed
  */