[glibmm] Gio::Emblem: Change EmblemOrigin to Emblem::Origin.

[Murray Cumming <murrayc src gnome org>]

commit cf3f6d7575b47d3a48e5e731085d01a64a301bf7
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Apr 18 12:03:03 2017 +0200

    Gio::Emblem: Change EmblemOrigin to Emblem::Origin.

 gio/src/emblem.ccg      |    2 ++
 gio/src/emblem.hg       |   15 ++++++++-------
 tools/m4/convert_gio.m4 |    2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/gio/src/emblem.ccg b/gio/src/emblem.ccg
index 5317f38..fb5dbea 100644
--- a/gio/src/emblem.ccg
+++ b/gio/src/emblem.ccg
@@ -19,6 +19,8 @@
 
 #include <gio/gio.h>
 
+using Origin = Gio::Emblem::Origin;
+
 namespace Gio
 {
 
diff --git a/gio/src/emblem.hg b/gio/src/emblem.hg
index 3b0fa37..9a88414 100644
--- a/gio/src/emblem.hg
+++ b/gio/src/emblem.hg
@@ -26,8 +26,6 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gio
 {
 
-_WRAP_ENUM(EmblemOrigin, GEmblemOrigin, NO_GTYPE)
-
 /** An object for emblems
  *
  * Emblem is an implementation of GIcon that supports having an emblem, which
@@ -46,6 +44,9 @@ class Emblem
   _CLASS_GOBJECT(Emblem, GEmblem, G_EMBLEM, Glib::Object, GObject)
   _IMPLEMENTS_INTERFACE(Icon)
 
+public:
+  _WRAP_ENUM(Origin, GEmblemOrigin, NO_GTYPE)
+
 protected:
   /** Creates a new emblem for @a icon.
    * @param icon A Gio::Icon containing the icon.
@@ -54,9 +55,9 @@ protected:
 
   /** Creates a new emblem for @a icon.
    * @param icon A Gio::Icon containing the icon.
-   * @param origin An EmblemOrigin value defining the emblem's origin
+   * @param origin An Origin value defining the emblem's origin
    */
- _WRAP_CTOR(Emblem(const Glib::RefPtr<Icon>& icon, EmblemOrigin origin), g_emblem_new_with_origin)
+ _WRAP_CTOR(Emblem(const Glib::RefPtr<Icon>& icon, Origin origin), g_emblem_new_with_origin)
 
 public:
   /** Creates a new emblem for @a icon.
@@ -66,13 +67,13 @@ public:
 
   /** Creates a new emblem for @a icon.
    * @param icon A Gio::Icon containing the icon.
-   * @param origin An EmblemOrigin value defining the emblem's origin
+   * @param origin An Origin value defining the emblem's origin
    */
-  _WRAP_CREATE(const Glib::RefPtr<Icon>& icon, EmblemOrigin origin)
+  _WRAP_CREATE(const Glib::RefPtr<Icon>& icon, Origin origin)
 
   _WRAP_METHOD(Glib::RefPtr<Icon> get_icon(), g_emblem_get_icon)
   _WRAP_METHOD(Glib::RefPtr<const Icon> get_icon() const, g_emblem_get_icon, constversion)
-  _WRAP_METHOD(EmblemOrigin get_origin() const, g_emblem_get_origin)
+  _WRAP_METHOD(Origin get_origin() const, g_emblem_get_origin)
 
 };
 
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index d4cf3b8..e66423a 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -46,7 +46,7 @@ _CONV_GIO_DBUS_ENUM(ServerFlags)
 _CONV_GIO_ENUM(DriveStartFlags)
 _CONV_GIO_ENUM(DriveStartFlags)
 _CONV_GIO_ENUM(DriveStartStopType)
-_CONV_GIO_ENUM(EmblemOrigin)
+_CONV_GIO_INCLASS_ENUM(Emblem,Origin)
 _CONV_GIO_ENUM(FileAttributeInfoFlags)
 _CONV_GIO_ENUM(FileAttributeStatus)
 _CONV_GIO_ENUM(FileAttributeType)