[glibmm] Gio::TlsPassword: Change TlsPasswordFlags to TlsPassword::Flags.

[Murray Cumming <murrayc src gnome org>]

commit 35b334cd690cff1cebab6eb0c1ef16e162e52103
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Apr 18 18:30:46 2017 +0200

    Gio::TlsPassword: Change TlsPasswordFlags to TlsPassword::Flags.

 gio/src/tlspassword.ccg |    2 ++
 gio/src/tlspassword.hg  |   14 ++++++++------
 tools/m4/convert_gio.m4 |    2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/gio/src/tlspassword.ccg b/gio/src/tlspassword.ccg
index d04c195..5a4c31c 100644
--- a/gio/src/tlspassword.ccg
+++ b/gio/src/tlspassword.ccg
@@ -16,3 +16,5 @@
  */
 
 #include <gio/gio.h>
+
+using Flags = Gio::TlsPassword::Flags;
diff --git a/gio/src/tlspassword.hg b/gio/src/tlspassword.hg
index cdf9d61..7e2ec17 100644
--- a/gio/src/tlspassword.hg
+++ b/gio/src/tlspassword.hg
@@ -23,7 +23,6 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gio
 {
 
-_WRAP_ENUM(TlsPasswordFlags, GTlsPasswordFlags)
 
 /** TlsPassword - TLS Passwords for prompting.
  * Holds a password used in TLS.
@@ -33,12 +32,15 @@ class TlsPassword : public Glib::Object
 {
   _CLASS_GOBJECT(TlsPassword, GTlsPassword, G_TLS_PASSWORD, Glib::Object, GObject)
 
+public:
+  _WRAP_ENUM(Flags, GTlsPasswordFlags)
+
 protected:
-  _WRAP_CTOR(TlsPassword(const Glib::ustring& description{.}, TlsPasswordFlags flags{.} = 
Gio::TlsPasswordFlags::NONE), g_tls_password_new)
+  _WRAP_CTOR(TlsPassword(const Glib::ustring& description{.}, Flags flags{.} = Flags::NONE), 
g_tls_password_new)
 
 public:
   _WRAP_METHOD_DOCS_ONLY(g_tls_password_new)
-  _WRAP_CREATE(const Glib::ustring& description{.}, TlsPasswordFlags flags{.} = Gio::TlsPasswordFlags::NONE)
+  _WRAP_CREATE(const Glib::ustring& description{.}, Flags flags{.} = Flags::NONE)
 
   _WRAP_METHOD(const guchar* get_value(gsize& length{?}) const, g_tls_password_get_value)
 
@@ -51,14 +53,14 @@ public:
   _WRAP_METHOD(Glib::ustring get_description() const, g_tls_password_get_description)
   _WRAP_METHOD(void set_description(const Glib::ustring& description), g_tls_password_set_description)
 
-  _WRAP_METHOD(TlsPasswordFlags get_flags() const, g_tls_password_get_flags)
-  _WRAP_METHOD(void set_flags(TlsPasswordFlags flags), g_tls_password_set_flags)
+  _WRAP_METHOD(Flags get_flags() const, g_tls_password_get_flags)
+  _WRAP_METHOD(void set_flags(Flags flags), g_tls_password_set_flags)
 
   _WRAP_METHOD(Glib::ustring get_warning() const, g_tls_password_get_warning)
   _WRAP_METHOD(void set_warning(const Glib::ustring& warning), g_tls_password_set_warning)
 
   _WRAP_PROPERTY("description", Glib::ustring)
-  _WRAP_PROPERTY("flags", TlsPasswordFlags)
+  _WRAP_PROPERTY("flags", Flags)
   _WRAP_PROPERTY("warning", Glib::ustring)
 
 #m4 _CONVERSION(`gsize*', `gsize&', `*($3)')
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index 1224cc3..445636a 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -76,7 +76,7 @@ _CONV_GIO_ENUM(TlsCertificateRequestFlags)
 _CONV_GIO_ENUM(TlsDatabaseVerifyFlags)
 _CONV_GIO_ENUM(TlsDatabaseLookupFlags)
 _CONV_GIO_ENUM(TlsInteractionResult)
-_CONV_GIO_ENUM(TlsPasswordFlags)
+_CONV_GIO_INCLASS_ENUM(TlsPassword,Flags)
 _CONV_GIO_ENUM(TlsRehandshakeMode)
 _CONV_GIO_ENUM(UnixSocketAddressType)
 _CONV_GIO_ENUM(ZlibCompressorFormat)