1 files changed, 137 insertions, 245 deletions
diff --git a/gio/src/dbusproxy.ccg b/gio/src/dbusproxy.ccg
index aac660ec..a8185739 100644
--- a/gio/src/dbusproxy.ccg
+++ b/gio/src/dbusproxy.ccg
@@ -30,348 +30,245 @@ namespace Gio
 namespace DBus
 {
 
-//Help the generate code:
+// Help the generate code:
 typedef Proxy::MapChangedProperties MapChangedProperties;
 
-Proxy::Proxy(const Glib::RefPtr<Connection>& connection,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<InterfaceInfo>& info,
+Proxy::Proxy(const Glib::RefPtr<Connection>& connection, const Glib::ustring& name,
+  const Glib::ustring& object_path, const Glib::ustring& interface_name, const SlotAsyncReady& slot,
+  const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<InterfaceInfo>& info,
   ProxyFlags flags)
-:
-_CONSTRUCT("g-connection", Glib::unwrap(connection),
-  "g-flags", static_cast<GDBusProxyFlags>(flags),
-  "g-interface-info", Glib::unwrap(info),
-  "g-name", Glib::c_str_or_nullptr(name),
-  "g-object-path", Glib::c_str_or_nullptr(object_path),
-  "g-interface-name", Glib::c_str_or_nullptr(interface_name))
+: _CONSTRUCT("g-connection", Glib::unwrap(connection), "g-flags",
+    static_cast<GDBusProxyFlags>(flags), "g-interface-info", Glib::unwrap(info), "g-name",
+    Glib::c_str_or_nullptr(name), "g-object-path", Glib::c_str_or_nullptr(object_path),
+    "g-interface-name", Glib::c_str_or_nullptr(interface_name))
 {
   init_async(slot, cancellable);
 }
 
-Proxy::Proxy(const Glib::RefPtr<Connection>& connection,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const SlotAsyncReady& slot,
-  const Glib::RefPtr<InterfaceInfo>& info,
-  ProxyFlags flags)
-:
-_CONSTRUCT("g-connection", Glib::unwrap(connection),
-  "g-flags", static_cast<GDBusProxyFlags>(flags),
-  "g-interface-info", Glib::unwrap(info),
-  "g-name", Glib::c_str_or_nullptr(name),
-  "g-object-path", Glib::c_str_or_nullptr(object_path),
-  "g-interface-name", Glib::c_str_or_nullptr(interface_name))
+Proxy::Proxy(const Glib::RefPtr<Connection>& connection, const Glib::ustring& name,
+  const Glib::ustring& object_path, const Glib::ustring& interface_name, const SlotAsyncReady& slot,
+  const Glib::RefPtr<InterfaceInfo>& info, ProxyFlags flags)
+: _CONSTRUCT("g-connection", Glib::unwrap(connection), "g-flags",
+    static_cast<GDBusProxyFlags>(flags), "g-interface-info", Glib::unwrap(info), "g-name",
+    Glib::c_str_or_nullptr(name), "g-object-path", Glib::c_str_or_nullptr(object_path),
+    "g-interface-name", Glib::c_str_or_nullptr(interface_name))
 {
   init_async(slot);
 }
 
-Proxy::Proxy(const Glib::RefPtr<Connection>& connection,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<InterfaceInfo>& info,
+Proxy::Proxy(const Glib::RefPtr<Connection>& connection, const Glib::ustring& name,
+  const Glib::ustring& object_path, const Glib::ustring& interface_name,
+  const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<InterfaceInfo>& info,
   ProxyFlags flags)
-:
-_CONSTRUCT("g-connection", Glib::unwrap(connection),
-  "g-flags", static_cast<GDBusProxyFlags>(flags),
-  "g-interface-info", Glib::unwrap(info),
-  "g-name", Glib::c_str_or_nullptr(name),
-  "g-object-path", Glib::c_str_or_nullptr(object_path),
-  "g-interface-name", Glib::c_str_or_nullptr(interface_name))
+: _CONSTRUCT("g-connection", Glib::unwrap(connection), "g-flags",
+    static_cast<GDBusProxyFlags>(flags), "g-interface-info", Glib::unwrap(info), "g-name",
+    Glib::c_str_or_nullptr(name), "g-object-path", Glib::c_str_or_nullptr(object_path),
+    "g-interface-name", Glib::c_str_or_nullptr(interface_name))
 {
   init(cancellable);
 }
 
-Proxy::Proxy(const Glib::RefPtr<Connection>& connection,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const Glib::RefPtr<InterfaceInfo>& info,
-  ProxyFlags flags)
-:
-_CONSTRUCT("g-connection", Glib::unwrap(connection),
-  "g-flags", static_cast<GDBusProxyFlags>(flags),
-  "g-interface-info", Glib::unwrap(info),
-  "g-name", Glib::c_str_or_nullptr(name),
-  "g-object-path", Glib::c_str_or_nullptr(object_path),
-  "g-interface-name", Glib::c_str_or_nullptr(interface_name))
+Proxy::Proxy(const Glib::RefPtr<Connection>& connection, const Glib::ustring& name,
+  const Glib::ustring& object_path, const Glib::ustring& interface_name,
+  const Glib::RefPtr<InterfaceInfo>& info, ProxyFlags flags)
+: _CONSTRUCT("g-connection", Glib::unwrap(connection), "g-flags",
+    static_cast<GDBusProxyFlags>(flags), "g-interface-info", Glib::unwrap(info), "g-name",
+    Glib::c_str_or_nullptr(name), "g-object-path", Glib::c_str_or_nullptr(object_path),
+    "g-interface-name", Glib::c_str_or_nullptr(interface_name))
 {
   init();
 }
 
-Proxy::Proxy(BusType bus_type,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<InterfaceInfo>& info,
+Proxy::Proxy(BusType bus_type, const Glib::ustring& name, const Glib::ustring& object_path,
+  const Glib::ustring& interface_name, const SlotAsyncReady& slot,
+  const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<InterfaceInfo>& info,
   ProxyFlags flags)
-:
-_CONSTRUCT("g-bus-type", static_cast<GBusType>(bus_type),
-  "g-flags", static_cast<GDBusProxyFlags>(flags),
-  "g-interface-info", Glib::unwrap(info),
-  "g-name", Glib::c_str_or_nullptr(name),
-  "g-object-path", Glib::c_str_or_nullptr(object_path),
-  "g-interface-name", Glib::c_str_or_nullptr(interface_name))
+: _CONSTRUCT("g-bus-type", static_cast<GBusType>(bus_type), "g-flags",
+    static_cast<GDBusProxyFlags>(flags), "g-interface-info", Glib::unwrap(info), "g-name",
+    Glib::c_str_or_nullptr(name), "g-object-path", Glib::c_str_or_nullptr(object_path),
+    "g-interface-name", Glib::c_str_or_nullptr(interface_name))
 {
   init_async(slot, cancellable);
 }
 
-Proxy::Proxy(BusType bus_type,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const SlotAsyncReady& slot,
-  const Glib::RefPtr<InterfaceInfo>& info,
-  ProxyFlags flags)
-:
-_CONSTRUCT("g-bus-type", static_cast<GBusType>(bus_type),
-  "g-flags", static_cast<GDBusProxyFlags>(flags),
-  "g-interface-info", Glib::unwrap(info),
-  "g-name", Glib::c_str_or_nullptr(name),
-  "g-object-path", Glib::c_str_or_nullptr(object_path),
-  "g-interface-name", Glib::c_str_or_nullptr(interface_name))
+Proxy::Proxy(BusType bus_type, const Glib::ustring& name, const Glib::ustring& object_path,
+  const Glib::ustring& interface_name, const SlotAsyncReady& slot,
+  const Glib::RefPtr<InterfaceInfo>& info, ProxyFlags flags)
+: _CONSTRUCT("g-bus-type", static_cast<GBusType>(bus_type), "g-flags",
+    static_cast<GDBusProxyFlags>(flags), "g-interface-info", Glib::unwrap(info), "g-name",
+    Glib::c_str_or_nullptr(name), "g-object-path", Glib::c_str_or_nullptr(object_path),
+    "g-interface-name", Glib::c_str_or_nullptr(interface_name))
 {
   init_async(slot);
 }
 
-Proxy::Proxy(BusType bus_type,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<InterfaceInfo>& info,
-  ProxyFlags flags)
-:
-_CONSTRUCT("g-bus-type", static_cast<GBusType>(bus_type),
-  "g-flags", static_cast<GDBusProxyFlags>(flags),
-  "g-interface-info", Glib::unwrap(info),
-  "g-name", Glib::c_str_or_nullptr(name),
-  "g-object-path", Glib::c_str_or_nullptr(object_path),
-  "g-interface-name", Glib::c_str_or_nullptr(interface_name))
+Proxy::Proxy(BusType bus_type, const Glib::ustring& name, const Glib::ustring& object_path,
+  const Glib::ustring& interface_name, const Glib::RefPtr<Cancellable>& cancellable,
+  const Glib::RefPtr<InterfaceInfo>& info, ProxyFlags flags)
+: _CONSTRUCT("g-bus-type", static_cast<GBusType>(bus_type), "g-flags",
+    static_cast<GDBusProxyFlags>(flags), "g-interface-info", Glib::unwrap(info), "g-name",
+    Glib::c_str_or_nullptr(name), "g-object-path", Glib::c_str_or_nullptr(object_path),
+    "g-interface-name", Glib::c_str_or_nullptr(interface_name))
 {
   init(cancellable);
 }
 
-Proxy::Proxy(BusType bus_type,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const Glib::RefPtr<InterfaceInfo>& info,
-  ProxyFlags flags)
-:
-_CONSTRUCT("g-bus-type", static_cast<GBusType>(bus_type),
-  "g-flags", static_cast<GDBusProxyFlags>(flags),
-  "g-interface-info", Glib::unwrap(info),
-  "g-name", Glib::c_str_or_nullptr(name),
-  "g-object-path", Glib::c_str_or_nullptr(object_path),
-  "g-interface-name", Glib::c_str_or_nullptr(interface_name))
+Proxy::Proxy(BusType bus_type, const Glib::ustring& name, const Glib::ustring& object_path,
+  const Glib::ustring& interface_name, const Glib::RefPtr<InterfaceInfo>& info, ProxyFlags flags)
+: _CONSTRUCT("g-bus-type", static_cast<GBusType>(bus_type), "g-flags",
+    static_cast<GDBusProxyFlags>(flags), "g-interface-info", Glib::unwrap(info), "g-name",
+    Glib::c_str_or_nullptr(name), "g-object-path", Glib::c_str_or_nullptr(object_path),
+    "g-interface-name", Glib::c_str_or_nullptr(interface_name))
 {
   init();
 }
 
-void Proxy::create(const Glib::RefPtr<Connection>& connection,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<InterfaceInfo>& info,
+void
+Proxy::create(const Glib::RefPtr<Connection>& connection, const Glib::ustring& name,
+  const Glib::ustring& object_path, const Glib::ustring& interface_name, const SlotAsyncReady& slot,
+  const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<InterfaceInfo>& info,
   ProxyFlags flags)
 {
-  Proxy(connection, name, object_path, interface_name, slot,
-    cancellable, info, flags);
+  Proxy(connection, name, object_path, interface_name, slot, cancellable, info, flags);
 }
 
-void Proxy::create(const Glib::RefPtr<Connection>& connection,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const SlotAsyncReady& slot,
-  const Glib::RefPtr<InterfaceInfo>& info,
-  ProxyFlags flags)
+void
+Proxy::create(const Glib::RefPtr<Connection>& connection, const Glib::ustring& name,
+  const Glib::ustring& object_path, const Glib::ustring& interface_name, const SlotAsyncReady& slot,
+  const Glib::RefPtr<InterfaceInfo>& info, ProxyFlags flags)
 {
   Proxy(connection, name, object_path, interface_name, slot, info, flags);
 }
 
 Glib::RefPtr<Proxy>
-Proxy::create_sync(const Glib::RefPtr<Connection>& connection,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<InterfaceInfo>& info,
+Proxy::create_sync(const Glib::RefPtr<Connection>& connection, const Glib::ustring& name,
+  const Glib::ustring& object_path, const Glib::ustring& interface_name,
+  const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<InterfaceInfo>& info,
   ProxyFlags flags)
 {
-  return Glib::RefPtr<Proxy>(new Proxy(connection, name,
-    object_path, interface_name, cancellable, info, flags));
+  return Glib::RefPtr<Proxy>(
+    new Proxy(connection, name, object_path, interface_name, cancellable, info, flags));
 }
 
 Glib::RefPtr<Proxy>
-Proxy::create_sync(const Glib::RefPtr<Connection>& connection,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const Glib::RefPtr<InterfaceInfo>& info,
-  ProxyFlags flags)
+Proxy::create_sync(const Glib::RefPtr<Connection>& connection, const Glib::ustring& name,
+  const Glib::ustring& object_path, const Glib::ustring& interface_name,
+  const Glib::RefPtr<InterfaceInfo>& info, ProxyFlags flags)
 {
-  return Glib::RefPtr<Proxy>(new Proxy(connection, name,
-    object_path, interface_name, info, flags));
+  return Glib::RefPtr<Proxy>(new Proxy(connection, name, object_path, interface_name, info, flags));
 }
 
-void Proxy::create_for_bus(BusType bus_type,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<InterfaceInfo>& info,
+void
+Proxy::create_for_bus(BusType bus_type, const Glib::ustring& name, const Glib::ustring& object_path,
+  const Glib::ustring& interface_name, const SlotAsyncReady& slot,
+  const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<InterfaceInfo>& info,
   ProxyFlags flags)
 {
-  Proxy(bus_type, name, object_path, interface_name, slot, cancellable,
-    info, flags);
+  Proxy(bus_type, name, object_path, interface_name, slot, cancellable, info, flags);
 }
 
-void Proxy::create_for_bus(BusType bus_type,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const SlotAsyncReady& slot,
-  const Glib::RefPtr<InterfaceInfo>& info,
-  ProxyFlags flags)
+void
+Proxy::create_for_bus(BusType bus_type, const Glib::ustring& name, const Glib::ustring& object_path,
+  const Glib::ustring& interface_name, const SlotAsyncReady& slot,
+  const Glib::RefPtr<InterfaceInfo>& info, ProxyFlags flags)
 {
   Proxy(bus_type, name, object_path, interface_name, slot, info, flags);
 }
 
-Glib::RefPtr<Proxy> Proxy::create_for_bus_sync(BusType bus_type,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<InterfaceInfo>& info,
+Glib::RefPtr<Proxy>
+Proxy::create_for_bus_sync(BusType bus_type, const Glib::ustring& name,
+  const Glib::ustring& object_path, const Glib::ustring& interface_name,
+  const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<InterfaceInfo>& info,
   ProxyFlags flags)
 {
-  return Glib::RefPtr<Proxy>(new Proxy(bus_type, name,
-    object_path, interface_name, cancellable, info, flags));
+  return Glib::RefPtr<Proxy>(
+    new Proxy(bus_type, name, object_path, interface_name, cancellable, info, flags));
 }
 
-Glib::RefPtr<Proxy> Proxy::create_for_bus_sync(BusType bus_type,
-  const Glib::ustring& name,
-  const Glib::ustring& object_path,
-  const Glib::ustring& interface_name,
-  const Glib::RefPtr<InterfaceInfo>& info,
-  ProxyFlags flags)
+Glib::RefPtr<Proxy>
+Proxy::create_for_bus_sync(BusType bus_type, const Glib::ustring& name,
+  const Glib::ustring& object_path, const Glib::ustring& interface_name,
+  const Glib::RefPtr<InterfaceInfo>& info, ProxyFlags flags)
 {
-  return Glib::RefPtr<Proxy>(new Proxy(bus_type, name,
-    object_path, interface_name, info, flags));
+  return Glib::RefPtr<Proxy>(new Proxy(bus_type, name, object_path, interface_name, info, flags));
 }
 
-void Proxy::get_cached_property(Glib::VariantBase& property,
-  const Glib::ustring& property_name) const
+void
+Proxy::get_cached_property(Glib::VariantBase& property, const Glib::ustring& property_name) const
 {
   GVariant* const g_variant =
-    g_dbus_proxy_get_cached_property(const_cast<GDBusProxy*>(gobj()),
-    property_name.c_str());
+    g_dbus_proxy_get_cached_property(const_cast<GDBusProxy*>(gobj()), property_name.c_str());
 
   property.init(g_variant, false /* no extra reference needed */);
 }
 
-void Proxy::call(const Glib::ustring& method_name,
-  const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::VariantContainerBase& parameters,
-  int timeout_msec,
-  CallFlags flags
-)
+void
+Proxy::call(const Glib::ustring& method_name, const SlotAsyncReady& slot,
+  const Glib::RefPtr<Cancellable>& cancellable, const Glib::VariantContainerBase& parameters,
+  int timeout_msec, CallFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_dbus_proxy_call(gobj(), method_name.c_str(),
-    const_cast<GVariant*>(parameters.gobj()),
-    static_cast<GDBusCallFlags>(flags), timeout_msec,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+  g_dbus_proxy_call(gobj(), method_name.c_str(), const_cast<GVariant*>(parameters.gobj()),
+    static_cast<GDBusCallFlags>(flags), timeout_msec, Glib::unwrap(cancellable),
+    &SignalProxy_async_callback, slot_copy);
 }
 
-void Proxy::call(const Glib::ustring& method_name,
-  const SlotAsyncReady& slot,
-  const Glib::VariantContainerBase& parameters,
-  int timeout_msec,
-  CallFlags flags
-)
+void
+Proxy::call(const Glib::ustring& method_name, const SlotAsyncReady& slot,
+  const Glib::VariantContainerBase& parameters, int timeout_msec, CallFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_dbus_proxy_call(gobj(), method_name.c_str(),
-    const_cast<GVariant*>(parameters.gobj()),
-    static_cast<GDBusCallFlags>(flags), timeout_msec,
-    nullptr, &SignalProxy_async_callback, slot_copy);
+  g_dbus_proxy_call(gobj(), method_name.c_str(), const_cast<GVariant*>(parameters.gobj()),
+    static_cast<GDBusCallFlags>(flags), timeout_msec, nullptr, &SignalProxy_async_callback,
+    slot_copy);
 }
 
-Glib::VariantContainerBase Proxy::call_sync(
-  const Glib::ustring& method_name,
-  const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::VariantContainerBase& parameters,
-  int timeout_msec,
-  CallFlags flags
-)
+Glib::VariantContainerBase
+Proxy::call_sync(const Glib::ustring& method_name, const Glib::RefPtr<Cancellable>& cancellable,
+  const Glib::VariantContainerBase& parameters, int timeout_msec, CallFlags flags)
 {
   GError* g_error = nullptr;
 
   GVariant* const gvariant =
-    g_dbus_proxy_call_sync(gobj(), method_name.c_str(),
-    const_cast<GVariant*>(parameters.gobj()),
-    static_cast<GDBusCallFlags>(flags), timeout_msec,
-    Glib::unwrap(cancellable), &g_error);
+    g_dbus_proxy_call_sync(gobj(), method_name.c_str(), const_cast<GVariant*>(parameters.gobj()),
+      static_cast<GDBusCallFlags>(flags), timeout_msec, Glib::unwrap(cancellable), &g_error);
 
-  if(g_error)
+  if (g_error)
     ::Glib::Error::throw_exception(g_error);
 
-  return Glib::VariantContainerBase(gvariant, false); //Dont' take an extra reference.
+  return Glib::VariantContainerBase(gvariant, false); // Dont' take an extra reference.
 }
 
-Glib::VariantContainerBase Proxy::call_sync(
-  const Glib::ustring& method_name,
-  const Glib::VariantContainerBase& parameters,
-  int timeout_msec,
-  CallFlags flags
-)
+Glib::VariantContainerBase
+Proxy::call_sync(const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters,
+  int timeout_msec, CallFlags flags)
 {
   GError* g_error = nullptr;
 
   GVariant* const gvariant =
-    g_dbus_proxy_call_sync(gobj(), method_name.c_str(),
-    const_cast<GVariant*>(parameters.gobj()),
-    static_cast<GDBusCallFlags>(flags), timeout_msec, nullptr, &g_error);
+    g_dbus_proxy_call_sync(gobj(), method_name.c_str(), const_cast<GVariant*>(parameters.gobj()),
+      static_cast<GDBusCallFlags>(flags), timeout_msec, nullptr, &g_error);
 
-  if(g_error)
+  if (g_error)
     ::Glib::Error::throw_exception(g_error);
 
-  return Glib::VariantContainerBase(gvariant, false); //Dont' take an extra reference.
+  return Glib::VariantContainerBase(gvariant, false); // Dont' take an extra reference.
 }
 
 #ifdef G_OS_UNIX
 // With a UnixFDList.
-void Proxy::call(
-  const Glib::ustring&                method_name,
-  const Glib::VariantContainerBase&   parameters,
-  const SlotAsyncReady&               slot,
-  const Glib::RefPtr<Cancellable>&    cancellable,
-  const Glib::RefPtr<UnixFDList>&     fd_list,
-  int                                 timeout_msec,
-  CallFlags                           flags)
+void
+Proxy::call(const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters,
+  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
+  const Glib::RefPtr<UnixFDList>& fd_list, int timeout_msec, CallFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -379,19 +276,15 @@ void Proxy::call(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_dbus_proxy_call_with_unix_fd_list(gobj(), method_name.c_str(),
-    const_cast<GVariant*>(parameters.gobj()),
-    static_cast<GDBusCallFlags>(flags), timeout_msec, Glib::unwrap(fd_list),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    const_cast<GVariant*>(parameters.gobj()), static_cast<GDBusCallFlags>(flags), timeout_msec,
+    Glib::unwrap(fd_list), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
 }
 
 // Non-cancellable version (with a UnixFDList).
-void Proxy::call(
-  const Glib::ustring&                method_name,
-  const Glib::VariantContainerBase&   parameters,
-  const SlotAsyncReady&               slot,
-  const Glib::RefPtr<UnixFDList>&     fd_list,
-  int                                 timeout_msec,
-  CallFlags                           flags)
+void
+Proxy::call(const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters,
+  const SlotAsyncReady& slot, const Glib::RefPtr<UnixFDList>& fd_list, int timeout_msec,
+  CallFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -399,12 +292,11 @@ void Proxy::call(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_dbus_proxy_call_with_unix_fd_list(gobj(), method_name.c_str(),
-    const_cast<GVariant*>(parameters.gobj()),
-    static_cast<GDBusCallFlags>(flags), timeout_msec, Glib::unwrap(fd_list),
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    const_cast<GVariant*>(parameters.gobj()), static_cast<GDBusCallFlags>(flags), timeout_msec,
+    Glib::unwrap(fd_list), nullptr, &SignalProxy_async_callback, slot_copy);
 }
 #endif // G_OS_UNIX
 
-} //namespace DBus
+} // namespace DBus
 
 } // namespace Gio