diff options
| author | Marcin Kolny <marcin.kolny@gmail.com> | 2016-04-03 17:22:45 +0200 |
|---|---|---|
| committer | Marcin Kolny <marcin.kolny@gmail.com> | 2016-04-05 19:37:59 +0200 |
| commit | 69fad0acec4ee0cbefeb5b4d4ccb362415e848cf (patch) | |
| tree | 23ea17d266a8b78e6d70f9102898b8c280bcf6f5 | |
| parent | 2a9a2c19f147c0c10480e050f19cf8dece693460 (diff) | |
| download | glibmm-69fad0acec4ee0cbefeb5b4d4ccb362415e848cf.tar.gz | |
Gio::DBus::Proxy: allow using GDBusProxy* conversion outside DBus namespace
* gio/src/dbusproxy.hg: fix _WRAP_METHOD usage
* tools/m4/convert_gio.m4: update converstion definition - use
Gio::DBus::Proxy instead of Proxy.
| -rw-r--r-- | gio/src/dbusproxy.hg | 4 | ||||
| -rw-r--r-- | tools/m4/convert_gio.m4 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gio/src/dbusproxy.hg b/gio/src/dbusproxy.hg index c015e778..2e3729f3 100644 --- a/gio/src/dbusproxy.hg +++ b/gio/src/dbusproxy.hg @@ -161,7 +161,7 @@ public: _WRAP_METHOD_DOCS_ONLY(g_dbus_proxy_new_finish) /// @throw Glib::Error. - _WRAP_METHOD(static Glib::RefPtr<Proxy> create_finish(const Glib::RefPtr<AsyncResult>& res), g_dbus_proxy_new_finish, errthrow) + _WRAP_METHOD(static Glib::RefPtr<Gio::DBus::Proxy> create_finish(const Glib::RefPtr<AsyncResult>& res), g_dbus_proxy_new_finish, errthrow) _WRAP_METHOD_DOCS_ONLY(g_dbus_proxy_new_sync) static Glib::RefPtr<Proxy> @@ -203,7 +203,7 @@ public: _WRAP_METHOD_DOCS_ONLY(g_dbus_proxy_new_for_bus_finish) /// @throw Glib::Error. - _WRAP_METHOD(static Glib::RefPtr<Proxy> create_for_bus_finish(const Glib::RefPtr<AsyncResult>& res), g_dbus_proxy_new_for_bus_finish, errthrow) + _WRAP_METHOD(static Glib::RefPtr<Gio::DBus::Proxy> create_for_bus_finish(const Glib::RefPtr<AsyncResult>& res), g_dbus_proxy_new_for_bus_finish, errthrow) _WRAP_METHOD_DOCS_ONLY(g_dbus_proxy_new_for_bus_sync) static Glib::RefPtr<Proxy> diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index 053fa239..e6f7cb46 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -139,7 +139,7 @@ _CONVERSION(`const Glib::RefPtr<Gio::DBus::Object>&',`GDBusObject*',`Glib::unwra _CONVERSION(`Glib::RefPtr<Gio::DBus::Object>',`GDBusObject*',`Glib::unwrap($3)') # DBusProxy -_CONVERSION(`GDBusProxy*',`Glib::RefPtr<Proxy>',`Glib::wrap($3)') +_CONVERSION(`GDBusProxy*',`Glib::RefPtr<Gio::DBus::Proxy>',`Glib::wrap($3)') # DesktopAppInfo _CONVERSION(`GDesktopAppInfo*', `Glib::RefPtr<DesktopAppInfo>', `Glib::wrap($3)') |