summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2017-04-18 12:29:03 +0200
committerMurray Cumming <murrayc@murrayc.com>2017-04-18 21:31:35 +0200
commit0125f314b9147bd6cdf49f5a4ccb4d59c85d82cd (patch)
treea2c1410d90b6d9f2b5e31d63f1a12eff8e004e9d
parentd1ff159572f0cd336316b00e5fb9b5dd087a9acc (diff)
downloadglibmm-0125f314b9147bd6cdf49f5a4ccb4d59c85d82cd.tar.gz
Gio::Credentials: Change CredentialsType to Credentials::Type.
-rw-r--r--gio/src/credentials.hg7
-rw-r--r--tools/m4/convert_gio.m42
2 files changed, 5 insertions, 4 deletions
diff --git a/gio/src/credentials.hg b/gio/src/credentials.hg
index b3612765..60fb0239 100644
--- a/gio/src/credentials.hg
+++ b/gio/src/credentials.hg
@@ -25,7 +25,6 @@ _PINCLUDE(glibmm/private/object_p.h)
namespace Gio
{
-_WRAP_ENUM(CredentialsType, GCredentialsType, NO_GTYPE)
/** An object containing credentials.
* The Credentials type is a reference-counted wrapper for native credentials.
@@ -58,12 +57,14 @@ protected:
_IGNORE(g_credentials_new)
public:
+ _WRAP_ENUM(Type, GCredentialsType, NO_GTYPE)
+
_WRAP_CREATE()
_WRAP_METHOD(Glib::ustring to_string() const, g_credentials_to_string)
- _WRAP_METHOD(gpointer get_native(CredentialsType native_type), g_credentials_get_native)
- _WRAP_METHOD(void set_native(CredentialsType native_type, gpointer native), g_credentials_set_native)
+ _WRAP_METHOD(gpointer get_native(Type native_type), g_credentials_get_native)
+ _WRAP_METHOD(void set_native(Type native_type, gpointer native), g_credentials_set_native)
_WRAP_METHOD(bool is_same_user(const Glib::RefPtr<const Credentials>& other_credentials), g_credentials_is_same_user, errthrow)
_WRAP_METHOD(uid_t get_unix_user(), g_credentials_get_unix_user, errthrow, ifdef G_OS_UNIX)
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index 1304c1b3..17e701f1 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -31,7 +31,7 @@ _CONV_GIO_ENUM(AskPasswordFlags)
_CONV_GIO_ENUM(BusType)
_CONV_GIO_INCLASS_ENUM(Converter,Flags)
_CONV_GIO_INCLASS_ENUM(Converter,Result)
-_CONV_GIO_ENUM(CredentialsType)
+_CONV_GIO_INCLASS_ENUM(Credentials,Type)
_CONV_GIO_ENUM(DataStreamByteOrder)
_CONV_GIO_ENUM(DataStreamNewlineType)
_CONV_GIO_DBUS_ENUM(CallFlags)