[glibmm] Gio::DBus: Don't use parameter name 'interface'

[Kjell Ahlstedt <kjellahl src gnome org>]

commit fb0bf14a29b80a0843e1e5dd1b5c5345d3839c93
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Wed Aug 27 15:46:00 2014 +0200

    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.

 gio/src/dbusmessage.hg |    9 +++++----
 gio/src/dbusobject.hg  |    9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg
index 71b9c89..20a15ed 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)
 
diff --git a/gio/src/dbusobject.hg b/gio/src/dbusobject.hg
index a1e47d6..5431004 100644
--- a/gio/src/dbusobject.hg
+++ b/gio/src/dbusobject.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -62,8 +60,11 @@ public:
 
 #m4 _CONVERSION(`GDBusInterface*',`const Glib::RefPtr<Gio::DBus::Interface>&',`Glib::wrap($3, true)')
 
-  _WRAP_SIGNAL(void interface_added(const Glib::RefPtr<Gio::DBus::Interface>& interface), "interface_added")
-  _WRAP_SIGNAL(void interface_removed(const Glib::RefPtr<Gio::DBus::Interface>& interface), 
"interface_removed")
+  // 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_SIGNAL(void interface_added(const Glib::RefPtr<Gio::DBus::Interface>& iface), "interface_added")
+  _WRAP_SIGNAL(void interface_removed(const Glib::RefPtr<Gio::DBus::Interface>& iface), "interface_removed")
 
 #m4 _CONVERSION(`Glib::ustring',`const gchar*',`g_strdup($3.c_str())')
   _WRAP_VFUNC(Glib::ustring get_object_path() const, "get_object_path")