diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2014-08-27 15:46:00 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2014-08-27 15:46:00 +0200 |
| commit | fb0bf14a29b80a0843e1e5dd1b5c5345d3839c93 (patch) | |
| tree | 3b0367f5637b9c5f6da16312fa8be672f9a9a310 /gio/src/dbusmessage.hg | |
| parent | 02ea51b113f2cb81ed6c22a2a2a6be63ad2e524b (diff) | |
| download | glibmm-fb0bf14a29b80a0843e1e5dd1b5c5345d3839c93.tar.gz | |
Gio::DBus: Don't use parameter name 'interface'
* gio/src/dbusmessage.hg:
* gio/src/dbusobject.hg: Change parameter name 'interface' to 'iface',
to avoid compilation errors with MinGW. Bug #735137.
Diffstat (limited to 'gio/src/dbusmessage.hg')
| -rw-r--r-- | gio/src/dbusmessage.hg | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg index 71b9c89a..20a15edb 100644 --- a/gio/src/dbusmessage.hg +++ b/gio/src/dbusmessage.hg @@ -1,5 +1,3 @@ -// -*- 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 @@ -67,8 +65,11 @@ public: // They are generally UTF-8 that can only contain the ASCII subset, // so ustring still seems preferrable to std::string, which generally implies an unknown encoding for us. - _WRAP_METHOD(static Glib::RefPtr<Message> create_signal(const Glib::ustring& path, const Glib::ustring& interface, const Glib::ustring& signal), g_dbus_message_new_signal) - _WRAP_METHOD(static Glib::RefPtr<Message> create_method_call(const Glib::ustring& name, const Glib::ustring& path, const Glib::ustring& interface, const Glib::ustring& method), g_dbus_message_new_method_call) + // The parameter name 'interface' can cause compilation errors with MinGW. + // See https://bugzilla.gnome.org/show_bug.cgi?id=735137 + // The parameter name in glib is 'interface_'. + _WRAP_METHOD(static Glib::RefPtr<Message> create_signal(const Glib::ustring& path, const Glib::ustring& iface, const Glib::ustring& signal), g_dbus_message_new_signal) + _WRAP_METHOD(static Glib::RefPtr<Message> create_method_call(const Glib::ustring& name, const Glib::ustring& path, const Glib::ustring& iface, const Glib::ustring& method), g_dbus_message_new_method_call) _WRAP_METHOD(static Glib::RefPtr<Message> create_method_reply(const Glib::RefPtr<Message>& method_call_message), g_dbus_message_new_method_reply) _WRAP_METHOD(static Glib::RefPtr<Message> create_method_error_literal(const Glib::RefPtr<const Message>& method_call_message, const Glib::ustring& error_name, const Glib::ustring& error_message), g_dbus_message_new_method_error_literal) |