GDL: Fix macro name with upstream libgdltypebuiltins

(bzr r10798)

3 files changed, 32 insertions, 33 deletions

diff --git a/src/libgdl/gdl-dock-master.c b/src/libgdl/gdl-dock-master.c
index 2bbb8eb3b..d4dd6e363 100644
--- a/src/libgdl/gdl-dock-master.c
+++ b/src/libgdl/gdl-dock-master.c
@@ -168,7 +168,7 @@ gdl_dock_master_class_init (GdlDockMasterClass *klass)
         g_param_spec_enum ("expand-direction", _("Expand direction"),
                            _("Allow the master's dock items to expand their container "
                              "dock objects in the given direction"),
-                           GDL_TYPE_EXPANSION_DIRECTION,
+                           GDL_TYPE_DOCK_EXPANSION_DIRECTION,
                            GDL_DOCK_EXPANSION_DIRECTION_NONE,
                            G_PARAM_READWRITE));
 
diff --git a/src/libgdl/libgdltypebuiltins.c b/src/libgdl/libgdltypebuiltins.c
index 853dc5d53..b8f985273 100644
--- a/src/libgdl/libgdltypebuiltins.c
+++ b/src/libgdl/libgdltypebuiltins.c
@@ -1,5 +1,5 @@
 
-/* Generated data (by glib-mkenums) */
+
 
 #include <glib-object.h>
 #include "libgdltypebuiltins.h"
@@ -64,8 +64,6 @@ gdl_dock_placement_get_type (void)
   return type;
 }
 
-
-
 static const GEnumValue _gdl_dock_expansion_direction_values[] = {
   { GDL_DOCK_EXPANSION_DIRECTION_NONE, "GDL_DOCK_EXPANSION_DIRECTION_NONE", "none" },
   { GDL_DOCK_EXPANSION_DIRECTION_UP, "GDL_DOCK_EXPANSION_DIRECTION_UP", "up" },
@@ -87,6 +85,29 @@ gdl_dock_expansion_direction_get_type (void)
 }
 
 
+/* enumerations from "gdl-dock-master.h" */
+static const GEnumValue _gdl_switcher_style_values[] = {
+  { GDL_SWITCHER_STYLE_TEXT, "GDL_SWITCHER_STYLE_TEXT", "text" },
+  { GDL_SWITCHER_STYLE_ICON, "GDL_SWITCHER_STYLE_ICON", "icon" },
+  { GDL_SWITCHER_STYLE_BOTH, "GDL_SWITCHER_STYLE_BOTH", "both" },
+  { GDL_SWITCHER_STYLE_TOOLBAR, "GDL_SWITCHER_STYLE_TOOLBAR", "toolbar" },
+  { GDL_SWITCHER_STYLE_TABS, "GDL_SWITCHER_STYLE_TABS", "tabs" },
+  { GDL_SWITCHER_STYLE_NONE, "GDL_SWITCHER_STYLE_NONE", "none" },
+  { 0, NULL, NULL }
+};
+
+GType
+gdl_switcher_style_get_type (void)
+{
+  static GType type = 0;
+
+  if (!type)
+    type = g_enum_register_static ("GdlSwitcherStyle", _gdl_switcher_style_values);
+
+  return type;
+}
+
+
 /* enumerations from "gdl-dock-item.h" */
 static const GFlagsValue _gdl_dock_item_behavior_values[] = {
   { GDL_DOCK_ITEM_BEH_NORMAL, "GDL_DOCK_ITEM_BEH_NORMAL", "normal" },
@@ -157,27 +178,5 @@ gdl_dock_bar_style_get_type (void)
 }
 
 
-/* enumerations from "gdl-switcher.h" */
-static const GEnumValue _gdl_switcher_style_values[] = {
-  { GDL_SWITCHER_STYLE_TEXT, "GDL_SWITCHER_STYLE_TEXT", "text" },
-  { GDL_SWITCHER_STYLE_ICON, "GDL_SWITCHER_STYLE_ICON", "icon" },
-  { GDL_SWITCHER_STYLE_BOTH, "GDL_SWITCHER_STYLE_BOTH", "both" },
-  { GDL_SWITCHER_STYLE_TOOLBAR, "GDL_SWITCHER_STYLE_TOOLBAR", "toolbar" },
-  { GDL_SWITCHER_STYLE_TABS, "GDL_SWITCHER_STYLE_TABS", "tabs" },
-  { 0, NULL, NULL }
-};
-
-GType
-gdl_switcher_style_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type)
-    type = g_enum_register_static ("GdlSwitcherStyle", _gdl_switcher_style_values);
-
-  return type;
-}
-
 
-/* Generated data ends here */
 
diff --git a/src/libgdl/libgdltypebuiltins.h b/src/libgdl/libgdltypebuiltins.h
index f5e6ea17b..a49194ad6 100644
--- a/src/libgdl/libgdltypebuiltins.h
+++ b/src/libgdl/libgdltypebuiltins.h
@@ -1,5 +1,5 @@
 
-/* Generated data (by glib-mkenums) */
+
 
 #ifndef __LIBGDLTYPEBUILTINS_H__
 #define __LIBGDLTYPEBUILTINS_H__ 1
@@ -16,9 +16,13 @@ GType gdl_dock_param_flags_get_type (void);
 GType gdl_dock_object_flags_get_type (void);
 #define GDL_TYPE_DOCK_PLACEMENT gdl_dock_placement_get_type()
 GType gdl_dock_placement_get_type (void);
-#define GDL_TYPE_EXPANSION_DIRECTION gdl_dock_expansion_direction_get_type()
+#define GDL_TYPE_DOCK_EXPANSION_DIRECTION gdl_dock_expansion_direction_get_type()
 GType gdl_dock_expansion_direction_get_type (void);
 
+/* --- gdl-dock-master.h --- */
+#define GDL_TYPE_SWITCHER_STYLE gdl_switcher_style_get_type()
+GType gdl_switcher_style_get_type (void);
+
 /* --- gdl-dock-item.h --- */
 #define GDL_TYPE_DOCK_ITEM_BEHAVIOR gdl_dock_item_behavior_get_type()
 GType gdl_dock_item_behavior_get_type (void);
@@ -28,13 +32,9 @@ GType gdl_dock_item_flags_get_type (void);
 /* --- gdl-dock-bar.h --- */
 #define GDL_TYPE_DOCK_BAR_STYLE gdl_dock_bar_style_get_type()
 GType gdl_dock_bar_style_get_type (void);
-
-/* --- gdl-switcher.h --- */
-#define GDL_TYPE_SWITCHER_STYLE gdl_switcher_style_get_type()
-GType gdl_switcher_style_get_type (void);
 G_END_DECLS
 
 #endif /* __LIBGDLTYPEBUILTINS_H__ */
 
-/* Generated data ends here */
+