diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2012-02-28 16:25:20 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2012-02-28 16:25:20 +0100 |
| commit | 0dfea3a4c04d47d31ba85594451bb91d1eebd892 (patch) | |
| tree | 36723860801995f26584b0e06a8183b32862d487 /gio | |
| parent | 5a59b62212f0b8875da815a5d136d7a0c2899fdf (diff) | |
| download | glibmm-0dfea3a4c04d47d31ba85594451bb91d1eebd892.tar.gz | |
DBus::Error, DBus::Proxy: Fix interaction with generate_wrap_init.pl.
* gio/src/dbuserror.hg: Remove now unnecessary declaration of friend
Gio::wrap_init().
* gio/src/dbusproxy.hg: Add _GMMPROC_EXTRA_NAMESPACE(DBus). Bug #640029.
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/src/dbuserror.hg | 12 | ||||
| -rw-r--r-- | gio/src/dbusproxy.hg | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/gio/src/dbuserror.hg b/gio/src/dbuserror.hg index 96f411f7..a68aa477 100644 --- a/gio/src/dbuserror.hg +++ b/gio/src/dbuserror.hg @@ -24,24 +24,12 @@ _DEFS(giomm,gio) namespace Gio { -#ifndef DOXYGEN_SHOULD_SKIP_THIS -//Our custom friend declaration (see below) needs this pre-declaration. -void wrap_init(); -#endif // DOXYGEN_SHOULD_SKIP_THIS - 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) - -#m4 _PUSH(SECTION_H_GERROR_PRIVATE) - //This extra line is only necessary because this class is in a sub-namespace, but we want - //it to be used in the wrap_init() of the main namespace. It's an awkward hack. - friend void Gio::wrap_init(); // uses throw_func() -#m4 _POP() - _WRAP_GERROR(Error, GDBusError, G_DBUS_ERROR, NO_GTYPE) } //namespace DBus diff --git a/gio/src/dbusproxy.hg b/gio/src/dbusproxy.hg index d019bd18..a17db055 100644 --- a/gio/src/dbusproxy.hg +++ b/gio/src/dbusproxy.hg @@ -32,6 +32,8 @@ namespace Gio 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_##, NO_GTYPE) |