[glibmm] Gio::DBus::InterfaceSkeleton: Change InterfaceSkeletonFlags to InterfaceSkeleton::Flags.

[Murray Cumming <murrayc src gnome org>]

commit bc3918c8cee29133878412a24eb8d74ec7d78f1a
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Apr 19 10:19:33 2017 +0200

    Gio::DBus::InterfaceSkeleton: Change InterfaceSkeletonFlags to InterfaceSkeleton::Flags.

 gio/src/dbusinterfaceskeleton.ccg |    2 ++
 gio/src/dbusinterfaceskeleton.hg  |   10 +++++-----
 tools/m4/convert_gio.m4           |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/gio/src/dbusinterfaceskeleton.ccg b/gio/src/dbusinterfaceskeleton.ccg
index e3e0f56..50e1f9f 100644
--- a/gio/src/dbusinterfaceskeleton.ccg
+++ b/gio/src/dbusinterfaceskeleton.ccg
@@ -18,3 +18,5 @@
 #include <giomm/dbusconnection.h>
 #include <giomm/dbusintrospection.h>
 #include <giomm/dbusmethodinvocation.h>
+
+using Flags = Gio::DBus::InterfaceSkeleton::Flags;
diff --git a/gio/src/dbusinterfaceskeleton.hg b/gio/src/dbusinterfaceskeleton.hg
index f956488..ef7b1a2 100644
--- a/gio/src/dbusinterfaceskeleton.hg
+++ b/gio/src/dbusinterfaceskeleton.hg
@@ -28,8 +28,6 @@ namespace Gio
 namespace DBus
 {
 
-_WRAP_ENUM(InterfaceSkeletonFlags, GDBusInterfaceSkeletonFlags, NO_GTYPE)
-
 class InterfaceInfo;
 class Connection;
 class MethodInvocation;
@@ -47,6 +45,8 @@ class InterfaceSkeleton
   _IMPLEMENTS_INTERFACE(Interface)
 
 public:
+  _WRAP_ENUM(Flags, GDBusInterfaceSkeletonFlags, NO_GTYPE)
+
   _WRAP_METHOD(void flush(), g_dbus_interface_skeleton_flush)
 
   _WRAP_METHOD(Glib::RefPtr<InterfaceInfo> get_info(), g_dbus_interface_skeleton_get_info)
@@ -72,10 +72,10 @@ public:
 
   _WRAP_METHOD(Glib::ustring get_object_path() const, g_dbus_interface_skeleton_get_object_path)
 
-  _WRAP_METHOD(InterfaceSkeletonFlags get_flags() const, g_dbus_interface_skeleton_get_flags)
-  _WRAP_METHOD(void set_flags(InterfaceSkeletonFlags flags), g_dbus_interface_skeleton_set_flags)
+  _WRAP_METHOD(Flags get_flags() const, g_dbus_interface_skeleton_get_flags)
+  _WRAP_METHOD(void set_flags(Flags flags), g_dbus_interface_skeleton_set_flags)
 
-  _WRAP_PROPERTY("g-flags", InterfaceSkeletonFlags)
+  _WRAP_PROPERTY("g-flags", Flags)
 
 #m4 _CONVERSION(`GDBusMethodInvocation*',`const Glib::RefPtr<MethodInvocation>&',`Glib::wrap($3, true)')
   _WRAP_SIGNAL(bool authorize_method(const Glib::RefPtr<MethodInvocation>& invocation), "g_authorize_method")
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index c9ef2fd..a8989df 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -36,7 +36,7 @@ _CONV_GIO_ENUM(DataStreamByteOrder)
 _CONV_GIO_ENUM(DataStreamNewlineType)
 _CONV_GIO_DBUS_ENUM(CallFlags)
 _CONV_GIO_DBUS_ENUM(CapabilityFlags)
-_CONV_GIO_DBUS_ENUM(InterfaceSkeletonFlags)
+_CONV_GIO_DBUS_INCLASS_ENUM(InterfaceSkeleton,Flags)
 _CONV_GIO_DBUS_ENUM(MessageFlags)
 _CONV_GIO_DBUS_ENUM(MessageHeaderField)
 _CONV_GIO_DBUS_ENUM(MessageType)