[glibmm] Use _WRAP_ENUM for Gio::DBus::Message::ByteOrder

[Kjell Ahlstedt <kjellahl src gnome org>]

commit 6f3b28c7b87ad3289c26901f78b859feb1b21d61
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Tue Jun 13 17:15:26 2017 +0200

    Use _WRAP_ENUM for Gio::DBus::Message::ByteOrder

 gio/src/dbusmessage.hg  |   12 ++----------
 tools/m4/convert_gio.m4 |    1 +
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg
index 7ae6f32..0abe21a 100644
--- a/gio/src/dbusmessage.hg
+++ b/gio/src/dbusmessage.hg
@@ -88,16 +88,8 @@ public:
   _WRAP_METHOD(MessageType get_message_type() const, g_dbus_message_get_message_type)
   _WRAP_METHOD(void set_message_type(MessageType type), g_dbus_message_set_message_type)
 
-  //gmmproc can't handle the character literals, and this won't be expanded in future,
-  //so we just wrap it by hand.
-  enum ByteOrder
-  {
-    BYTE_ORDER_BIG_ENDIAN    = 'B',
-    BYTE_ORDER_LITTLE_ENDIAN = 'l'
-  };
-
-  #m4 _CONVERSION(`ByteOrder',`GDBusMessageByteOrder',`(GDBusMessageByteOrder)($3)')
-  #m4 _CONVERSION(`GDBusMessageByteOrder',`ByteOrder',`(ByteOrder)($3)')
+  // BIG_ENDIAN and LITTLE_ENDIAN are defined as preprocessor macros somewhere.
+  _WRAP_ENUM(ByteOrder, GDBusMessageByteOrder, NO_GTYPE, s#ENDIAN$#ENDIAN_ORDER#)
 
   _WRAP_METHOD(ByteOrder get_byte_order() const, g_dbus_message_get_byte_order)
   _WRAP_METHOD(void set_byte_order(ByteOrder byte_order), g_dbus_message_set_byte_order)
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index a8989df..6a968b3 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -37,6 +37,7 @@ _CONV_GIO_ENUM(DataStreamNewlineType)
 _CONV_GIO_DBUS_ENUM(CallFlags)
 _CONV_GIO_DBUS_ENUM(CapabilityFlags)
 _CONV_GIO_DBUS_INCLASS_ENUM(InterfaceSkeleton,Flags)
+_CONV_GIO_DBUS_INCLASS_ENUM(Message,ByteOrder)
 _CONV_GIO_DBUS_ENUM(MessageFlags)
 _CONV_GIO_DBUS_ENUM(MessageHeaderField)
 _CONV_GIO_DBUS_ENUM(MessageType)