summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2019-01-08 08:47:13 +0100
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2019-01-08 08:47:13 +0100
commitbd5610833c4120abbf99bec9425127b346c16bb5 (patch)
treeacca4c87b5b5d984714d97c5c8605d0f67c30e73
parent17e3b167900b95986babeb8fcabd335881ea4d53 (diff)
downloadglibmm-bd5610833c4120abbf99bec9425127b346c16bb5.tar.gz
Revert "Gio: Remove NO_GTYPE from some _WRAP_ENUMs"
This reverts commit 17e3b167900b95986babeb8fcabd335881ea4d53. The reverted commit added new ABI. It must not be added to the glibmm-2-58 branch.
-rw-r--r--gio/src/application.hg2
-rw-r--r--gio/src/dbusinterfaceskeleton.hg2
-rw-r--r--gio/src/dbusmessage.hg2
-rw-r--r--gio/src/dbusproxy.hg2
-rw-r--r--gio/src/dbusserver.hg4
-rw-r--r--gio/src/enums.hg7
-rw-r--r--gio/src/mountoperation.hg4
-rw-r--r--gio/src/networkmonitor.hg2
-rw-r--r--glib/src/date.hg2
9 files changed, 17 insertions, 10 deletions
diff --git a/gio/src/application.hg b/gio/src/application.hg
index 67fb5a35..28db5c76 100644
--- a/gio/src/application.hg
+++ b/gio/src/application.hg
@@ -34,7 +34,7 @@ _PINCLUDE(glibmm/private/object_p.h)
namespace Gio
{
-_WRAP_ENUM(ApplicationFlags, GApplicationFlags)
+_WRAP_ENUM(ApplicationFlags, GApplicationFlags, NO_GTYPE)
/** Application - Core application class.
* An Application is the foundation of an application, unique for a given
diff --git a/gio/src/dbusinterfaceskeleton.hg b/gio/src/dbusinterfaceskeleton.hg
index 2261216a..18612d3b 100644
--- a/gio/src/dbusinterfaceskeleton.hg
+++ b/gio/src/dbusinterfaceskeleton.hg
@@ -27,7 +27,7 @@ namespace Gio
namespace DBus
{
-_WRAP_ENUM(InterfaceSkeletonFlags, GDBusInterfaceSkeletonFlags, gtype_func g_dbus_interface_skeleton_flags_get_type)
+_WRAP_ENUM(InterfaceSkeletonFlags, GDBusInterfaceSkeletonFlags, NO_GTYPE)
class InterfaceInfo;
class Connection;
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg
index da0a382a..22076045 100644
--- a/gio/src/dbusmessage.hg
+++ b/gio/src/dbusmessage.hg
@@ -34,7 +34,7 @@ namespace DBus
_WRAP_ENUM(MessageType, GDBusMessageType, s#^DBUS_##, NO_GTYPE)
_WRAP_ENUM(MessageFlags, GDBusMessageFlags, s#^DBUS_##, NO_GTYPE)
_WRAP_ENUM(MessageHeaderField, GDBusMessageHeaderField, s#^DBUS_##, NO_GTYPE)
-_WRAP_ENUM(CapabilityFlags, GDBusCapabilityFlags, s#^DBUS_##, gtype_func g_dbus_capability_flags_get_type)
+_WRAP_ENUM(CapabilityFlags, GDBusCapabilityFlags, s#^DBUS_##, NO_GTYPE)
_GMMPROC_EXTRA_NAMESPACE(DBus)
diff --git a/gio/src/dbusproxy.hg b/gio/src/dbusproxy.hg
index 1c753f06..de241b76 100644
--- a/gio/src/dbusproxy.hg
+++ b/gio/src/dbusproxy.hg
@@ -32,7 +32,7 @@ namespace DBus
//The GMMPROC_EXTRA_NAMESPACE() macro is a hint to generate_wrap_init.pl to put it in the DBus sub-namespace
_GMMPROC_EXTRA_NAMESPACE(DBus)
-_WRAP_ENUM(ProxyFlags, GDBusProxyFlags, s#^DBUS_##, gtype_func g_dbus_proxy_flags_get_type)
+_WRAP_ENUM(ProxyFlags, GDBusProxyFlags, s#^DBUS_##, NO_GTYPE)
/** A client-side proxy.
* This is a base class used for proxies to access a D-Bus interface on
diff --git a/gio/src/dbusserver.hg b/gio/src/dbusserver.hg
index 6f1bb986..64ed21b7 100644
--- a/gio/src/dbusserver.hg
+++ b/gio/src/dbusserver.hg
@@ -1,3 +1,5 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
/* Copyright (C) 2010 The giomm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -28,7 +30,7 @@ namespace Gio
namespace DBus
{
-_WRAP_ENUM(ServerFlags, GDBusServerFlags, s#^DBUS_##, gtype_func g_dbus_server_flags_get_type)
+_WRAP_ENUM(ServerFlags, GDBusServerFlags, s#^DBUS_##, NO_GTYPE)
_GMMPROC_EXTRA_NAMESPACE(DBus)
diff --git a/gio/src/enums.hg b/gio/src/enums.hg
index a80830b9..e38c5db9 100644
--- a/gio/src/enums.hg
+++ b/gio/src/enums.hg
@@ -1,3 +1,5 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
/* Copyright (C) 2007 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -22,11 +24,12 @@ _DEFS(giomm,gio)
namespace Gio
{
-_WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder)
-_WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType)
+_WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder, NO_GTYPE)
+_WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType, NO_GTYPE)
_WRAP_ENUM(ErrorEnum, GIOErrorEnum, NO_GTYPE)
_WRAP_ENUM(SocketFamily, GSocketFamily)
_WRAP_ENUM(TlsAuthenticationMode, GTlsAuthenticationMode)
_WRAP_ENUM(TlsCertificateFlags, GTlsCertificateFlags)
} // namespace Gio
+
diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg
index 1e69765e..1e128526 100644
--- a/gio/src/mountoperation.hg
+++ b/gio/src/mountoperation.hg
@@ -1,3 +1,5 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
/* Copyright (C) 2007 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -25,7 +27,7 @@ namespace Gio
{
_WRAP_ENUM(AskPasswordFlags, GAskPasswordFlags, NO_GTYPE)
-_WRAP_ENUM(PasswordSave, GPasswordSave)
+_WRAP_ENUM(PasswordSave, GPasswordSave, NO_GTYPE)
_WRAP_ENUM(MountOperationResult, GMountOperationResult, NO_GTYPE)
/** Authentication methods for mountable locations.
diff --git a/gio/src/networkmonitor.hg b/gio/src/networkmonitor.hg
index c3d75c94..4ed6fc9f 100644
--- a/gio/src/networkmonitor.hg
+++ b/gio/src/networkmonitor.hg
@@ -31,7 +31,7 @@ typedef struct _GNetworkMonitorInterface GNetworkMonitorInterface;
namespace Gio
{
-_WRAP_ENUM(NetworkConnectivity, GNetworkConnectivity)
+_WRAP_ENUM(NetworkConnectivity, GNetworkConnectivity, NO_GTYPE)
/** TODO
diff --git a/glib/src/date.hg b/glib/src/date.hg
index 4c29fb59..64d4e9e4 100644
--- a/glib/src/date.hg
+++ b/glib/src/date.hg
@@ -36,7 +36,7 @@ public:
using Day = guint8 ;
using Year = guint16;
- _WRAP_ENUM(Month, GDateMonth, s#^DATE_##, NO_GTYPE)
+ _WRAP_ENUM(Month, GDateMonth, s#^DATE_##, NO_GTYPE, get_type_func=)
_WRAP_ENUM(Weekday, GDateWeekday, s#^DATE_##, NO_GTYPE)
_WRAP_ENUM(DMY, GDateDMY, s#^DATE_##, NO_GTYPE)