Add Gio::giomm_SignalProxy_async_callback() with C linkage

and use it instead of SignalProxy_async_callback().
Part of issue #1

37 files changed, 276 insertions, 217 deletions

diff --git a/gio/giomm/slot_async.cc b/gio/giomm/slot_async.cc
index db23dbf5..d06bf9a5 100644
--- a/gio/giomm/slot_async.cc
+++ b/gio/giomm/slot_async.cc
@@ -20,9 +20,14 @@
 
 namespace Gio
 {
-
+extern "C"
+{
+// A function with external linkage and C linkage does not get a mangled name.
+// Even though giomm_SignalProxy_async_callback is declared in a named namespace,
+// the linker does not see the namespace name, only 'giomm_SignalProxy_async_callback'.
+// Therefore the function name shall have a prefix, hopefully unique.
 void
-SignalProxy_async_callback(GObject*, GAsyncResult* res, void* data)
+giomm_SignalProxy_async_callback(GObject*, GAsyncResult* res, void* data)
 {
   Gio::SlotAsyncReady* the_slot = static_cast<Gio::SlotAsyncReady*>(data);
 
@@ -38,5 +43,13 @@ SignalProxy_async_callback(GObject*, GAsyncResult* res, void* data)
 
   delete the_slot;
 }
+} // extern "C"
+
+//TODO: Remove SignalProxy_async_callback when we can break ABI and API.
+void
+SignalProxy_async_callback(GObject* source_object, GAsyncResult* res, void* data)
+{
+  giomm_SignalProxy_async_callback(source_object, res, data);
+}
 
 } // namespace Gio
diff --git a/gio/giomm/slot_async.h b/gio/giomm/slot_async.h
index ed76b5b4..cc38cf84 100644
--- a/gio/giomm/slot_async.h
+++ b/gio/giomm/slot_async.h
@@ -24,14 +24,34 @@
 
 namespace Gio
 {
+extern "C"
+{
+/** Callback function, used in combination with Gio::SlotAsyncReady.
+ *
+ * Example:
+ * @code
+ * _WRAP_METHOD(void acquire_async(const Gio::SlotAsyncReady& slot{callback},
+ *   const Glib::RefPtr<Gio::Cancellable>& cancellable{.?}), g_permission_acquire_async,
+ *   slot_name slot, slot_callback Gio::giomm_SignalProxy_async_callback)
+ * @endcode
+ *
+ * @newin{2,78}
+ */
+GIOMM_API
+void giomm_SignalProxy_async_callback(GObject*, GAsyncResult* res, void* data);
 
+} // extern "C"
+
+//TODO: Remove SignalProxy_async_callback when we can break ABI and API.
 /** Callback function, used in combination with Gio::SlotAsyncReady.
  *
+ * Prefer giomm_SignalProxy_async_callback() as a callback from a C function.
+ *
  * Example:
  * @code
- * _WRAP_METHOD(void acquire_async(const SlotAsyncReady& slot{callback},
- *   const Glib::RefPtr<Cancellable>& cancellable{.?}), g_permission_acquire_async,
- *   slot_name slot, slot_callback SignalProxy_async_callback)
+ * _WRAP_METHOD(void acquire_async(const Gio::SlotAsyncReady& slot{callback},
+ *   const Glib::RefPtr<Gio::Cancellable>& cancellable{.?}), g_permission_acquire_async,
+ *   slot_name slot, slot_callback Gio::SignalProxy_async_callback)
  * @endcode
  */
 GIOMM_API
diff --git a/gio/src/appinfo.hg b/gio/src/appinfo.hg
index b93302eb..15a7a6ec 100644
--- a/gio/src/appinfo.hg
+++ b/gio/src/appinfo.hg
@@ -191,7 +191,7 @@ public:
     const Glib::RefPtr<AppLaunchContext>& context{.},
     const SlotAsyncReady& slot{callback?},
     const Glib::RefPtr<Cancellable>& cancellable{.} = {}),
-    g_app_info_launch_uris_async, slot_name slot, slot_callback SignalProxy_async_callback, newin "2,60")
+    g_app_info_launch_uris_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback, newin "2,60")
   _WRAP_METHOD(bool launch_uris_finish(const Glib::RefPtr<AsyncResult>& result),
     g_app_info_launch_uris_finish, errthrow, newin "2,60")
 
@@ -232,7 +232,7 @@ public:
     bool must_support_uris = true), g_app_info_get_default_for_type)
   _WRAP_METHOD(static void get_default_for_type_async(const std::string& content_type, bool must_support_uris,
     const SlotAsyncReady& slot{callback?}, const Glib::RefPtr<Cancellable>& cancellable{.} = {}),
-    g_app_info_get_default_for_type_async, slot_name slot, slot_callback SignalProxy_async_callback)
+    g_app_info_get_default_for_type_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(static Glib::RefPtr<AppInfo> get_default_for_type_finish(const Glib::RefPtr<AsyncResult>& result),
     g_app_info_get_default_for_type_finish, errthrow)
 
@@ -240,7 +240,7 @@ public:
     g_app_info_get_default_for_uri_scheme)
   _WRAP_METHOD(static void get_default_for_uri_scheme_async(const std::string& content_type,
     const SlotAsyncReady& slot{callback?}, const Glib::RefPtr<Cancellable>& cancellable{.} = {}),
-    g_app_info_get_default_for_uri_scheme_async, slot_name slot, slot_callback SignalProxy_async_callback)
+    g_app_info_get_default_for_uri_scheme_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(static Glib::RefPtr<AppInfo> get_default_for_uri_scheme_finish(const Glib::RefPtr<AsyncResult>& result),
     g_app_info_get_default_for_uri_scheme_finish, errthrow)
 
@@ -249,7 +249,7 @@ public:
 
   _WRAP_METHOD(static void launch_default_for_uri_async(const std::string& uri, const Glib::RefPtr<AppLaunchContext>& context{.?},
     const SlotAsyncReady& slot{callback?}, const Glib::RefPtr<Cancellable>& cancellable{.?}),
-    g_app_info_launch_default_for_uri_async, slot_name slot, slot_callback SignalProxy_async_callback)
+    g_app_info_launch_default_for_uri_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(static bool launch_default_for_uri_finish(const Glib::RefPtr<AsyncResult>& result), g_app_info_launch_default_for_uri_finish, errthrow)
 
 protected:
diff --git a/gio/src/asyncinitable.ccg b/gio/src/asyncinitable.ccg
index 38b5dd1c..8b47b903 100644
--- a/gio/src/asyncinitable.ccg
+++ b/gio/src/asyncinitable.ccg
@@ -62,7 +62,7 @@ AsyncInitable::init_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_async_initable_init_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -73,7 +73,7 @@ AsyncInitable::init_async(const SlotAsyncReady& slot, int io_priority)
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_async_initable_init_async(gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+  g_async_initable_init_async(gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -134,7 +134,7 @@ Gio::AsyncInitable::init_async_vfunc(
   if (base && base->init_async)
   {
     (*base->init_async)(gobj(), io_priority, const_cast<GCancellable*>(Glib::unwrap(cancellable)),
-      &SignalProxy_async_callback, const_cast<SlotAsyncReady*>(&slot));
+      &giomm_SignalProxy_async_callback, const_cast<SlotAsyncReady*>(&slot));
   }
 }
 gboolean
diff --git a/gio/src/bufferedinputstream.ccg b/gio/src/bufferedinputstream.ccg
index c4ed802a..d05ef5df 100644
--- a/gio/src/bufferedinputstream.ccg
+++ b/gio/src/bufferedinputstream.ccg
@@ -36,7 +36,7 @@ BufferedInputStream::fill_async(const SlotAsyncReady& slot, gssize count,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_buffered_input_stream_fill_async(
-    gobj(), count, io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), count, io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -48,7 +48,7 @@ BufferedInputStream::fill_async(const SlotAsyncReady& slot, gssize count, int io
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_buffered_input_stream_fill_async(
-    gobj(), count, io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), count, io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/datainputstream.ccg b/gio/src/datainputstream.ccg
index bcf7f3bb..37a3eea8 100644
--- a/gio/src/datainputstream.ccg
+++ b/gio/src/datainputstream.ccg
@@ -69,7 +69,7 @@ DataInputStream::read_line_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_data_input_stream_read_line_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 bool
@@ -147,7 +147,7 @@ DataInputStream::read_upto_async(const std::string& stop_chars, const SlotAsyncR
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_data_input_stream_read_upto_async(gobj(), stop_chars.c_str(), -1, /* null-terminated */
-    io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 bool
diff --git a/gio/src/dbusaddress.ccg b/gio/src/dbusaddress.ccg
index c9d128fc..95209480 100644
--- a/gio/src/dbusaddress.ccg
+++ b/gio/src/dbusaddress.ccg
@@ -49,14 +49,14 @@ get_stream(const std::string& address, const SlotAsyncReady slot,
 {
   auto slot_copy = new SlotAsyncReady(slot);
   g_dbus_address_get_stream(
-    address.c_str(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    address.c_str(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
 get_stream(const std::string& address, const SlotAsyncReady slot)
 {
   auto slot_copy = new SlotAsyncReady(slot);
-  g_dbus_address_get_stream(address.c_str(), nullptr, &SignalProxy_async_callback, slot_copy);
+  g_dbus_address_get_stream(address.c_str(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 Glib::RefPtr<IOStream>
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index 67dceee8..c40edf47 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -399,7 +399,7 @@ Connection::get(
 {
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_bus_get(static_cast<GBusType>(bus_type), Glib::unwrap(cancellable), &SignalProxy_async_callback,
+  g_bus_get(static_cast<GBusType>(bus_type), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -409,7 +409,7 @@ Connection::get(BusType bus_type, const SlotAsyncReady& slot)
 {
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_bus_get(static_cast<GBusType>(bus_type), nullptr, &SignalProxy_async_callback, slot_copy);
+  g_bus_get(static_cast<GBusType>(bus_type), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -424,7 +424,7 @@ Connection::close(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& c
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_dbus_connection_close(
-    gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -432,7 +432,7 @@ Connection::close(const SlotAsyncReady& slot)
 {
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_dbus_connection_close(gobj(), nullptr, &SignalProxy_async_callback, slot_copy);
+  g_dbus_connection_close(gobj(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -447,7 +447,7 @@ Connection::flush(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& c
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_dbus_connection_flush(
-    gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -455,7 +455,7 @@ Connection::flush(const SlotAsyncReady& slot)
 {
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_dbus_connection_flush(gobj(), nullptr, &SignalProxy_async_callback, slot_copy);
+  g_dbus_connection_flush(gobj(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 bool
@@ -480,7 +480,7 @@ Connection::send_message_with_reply(const Glib::RefPtr<Message>& message, int ti
   volatile guint32 out_serial = 0;
   g_dbus_connection_send_message_with_reply(gobj(), Glib::unwrap(message),
     static_cast<GDBusSendMessageFlags>(message->get_flags()), timeout_msec, &out_serial,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
   message->set_serial(out_serial);
 }
 
@@ -492,7 +492,7 @@ Connection::send_message_with_reply(
   volatile guint32 out_serial = 0;
   g_dbus_connection_send_message_with_reply(gobj(), Glib::unwrap(message),
     static_cast<GDBusSendMessageFlags>(message->get_flags()), timeout_msec, &out_serial, nullptr,
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
   message->set_serial(out_serial);
 }
 
@@ -544,7 +544,7 @@ Connection::call(const Glib::ustring& object_path, const Glib::ustring& interfac
   g_dbus_connection_call(gobj(), Glib::c_str_or_nullptr(bus_name), object_path.c_str(),
     interface_name.c_str(), method_name.c_str(), const_cast<GVariant*>(parameters.gobj()),
     reply_type.gobj(), static_cast<GDBusCallFlags>(flags), timeout_msec, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 // Non-cancellable version.
@@ -562,7 +562,7 @@ Connection::call(const Glib::ustring& object_path, const Glib::ustring& interfac
   g_dbus_connection_call(gobj(), Glib::c_str_or_nullptr(bus_name), object_path.c_str(),
     interface_name.c_str(), method_name.c_str(), const_cast<GVariant*>(parameters.gobj()),
     reply_type.gobj(), static_cast<GDBusCallFlags>(flags), timeout_msec, nullptr,
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 Glib::VariantContainerBase
@@ -621,7 +621,7 @@ Connection::call(const Glib::ustring& object_path, const Glib::ustring& interfac
   g_dbus_connection_call_with_unix_fd_list(gobj(), Glib::c_str_or_nullptr(bus_name),
     object_path.c_str(), interface_name.c_str(), method_name.c_str(),
     const_cast<GVariant*>(parameters.gobj()), reply_type.gobj(), static_cast<GDBusCallFlags>(flags),
-    timeout_msec, Glib::unwrap(fd_list), Glib::unwrap(cancellable), &SignalProxy_async_callback,
+    timeout_msec, Glib::unwrap(fd_list), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -641,7 +641,7 @@ Connection::call(const Glib::ustring& object_path, const Glib::ustring& interfac
   g_dbus_connection_call_with_unix_fd_list(gobj(), Glib::c_str_or_nullptr(bus_name),
     object_path.c_str(), interface_name.c_str(), method_name.c_str(),
     const_cast<GVariant*>(parameters.gobj()), reply_type.gobj(), static_cast<GDBusCallFlags>(flags),
-    timeout_msec, Glib::unwrap(fd_list), nullptr, &SignalProxy_async_callback, slot_copy);
+    timeout_msec, Glib::unwrap(fd_list), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 #endif // G_OS_UNIX
 
diff --git a/gio/src/dbusproxy.hg b/gio/src/dbusproxy.hg
index f8b47b1e..6314e3da 100644
--- a/gio/src/dbusproxy.hg
+++ b/gio/src/dbusproxy.hg
@@ -271,7 +271,7 @@ public:
       int                                timeout_msec{.} = -1,
       CallFlags                          flags{.} = Gio::DBus::CallFlags::NONE
     ),
-    g_dbus_proxy_call, slot_name slot, slot_callback SignalProxy_async_callback
+    g_dbus_proxy_call, slot_name slot, slot_callback giomm_SignalProxy_async_callback
   )
 
   /** Finishes an operation started with call().
@@ -306,7 +306,7 @@ public:
       CallFlags                           flags{.} = Gio::DBus::CallFlags::NONE
     ),
     g_dbus_proxy_call_with_unix_fd_list, ifdef G_OS_UNIX,
-      slot_name slot, slot_callback SignalProxy_async_callback
+      slot_name slot, slot_callback giomm_SignalProxy_async_callback
   )
 
   /** Finishes an operation started with call() (with a UnixFDList).
diff --git a/gio/src/drive.ccg b/gio/src/drive.ccg
index f8e0796e..c3e132a8 100644
--- a/gio/src/drive.ccg
+++ b/gio/src/drive.ccg
@@ -36,7 +36,7 @@ Drive::eject(
 
   g_drive_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     nullptr, // mount_operation
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -50,7 +50,7 @@ Drive::eject(const SlotAsyncReady& slot, Mount::UnmountFlags flags)
   g_drive_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     nullptr, // mount_operation
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -63,7 +63,7 @@ Drive::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyn
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_drive_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
-    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &SignalProxy_async_callback,
+    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -79,7 +79,7 @@ Drive::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyn
   g_drive_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     Glib::unwrap(mount_operation),
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -110,7 +110,7 @@ Drive::poll_for_media(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_drive_poll_for_media(gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+  g_drive_poll_for_media(gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -123,7 +123,7 @@ Drive::poll_for_media(const SlotAsyncReady& slot)
 
   g_drive_poll_for_media(gobj(),
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -144,7 +144,7 @@ Drive::stop(const Glib::RefPtr<MountOperation>& mount_operation,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_drive_stop(gobj(), static_cast<GMountUnmountFlags>(flags), Glib::unwrap(mount_operation),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -157,7 +157,7 @@ Drive::stop(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsync
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_drive_stop(gobj(), static_cast<GMountUnmountFlags>(flags), Glib::unwrap(mount_operation),
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -170,7 +170,7 @@ Drive::start(const Glib::RefPtr<MountOperation>& mount_operation,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_drive_start(gobj(), static_cast<GDriveStartFlags>(flags), Glib::unwrap(mount_operation),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -183,7 +183,7 @@ Drive::start(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyn
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_drive_start(gobj(), static_cast<GDriveStartFlags>(flags), Glib::unwrap(mount_operation),
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/file.ccg b/gio/src/file.ccg
index 484bad52..3df2e4b5 100644
--- a/gio/src/file.ccg
+++ b/gio/src/file.ccg
@@ -47,7 +47,7 @@ SignalProxy_file_progress_callback(
   }
 }
 
-// Same as SignalProxy_async_callback, except that this one knows that
+// Same as giomm_SignalProxy_async_callback, except that this one knows that
 // the slot is packed in a pair. The operation is assumed to be finished
 // after the callback is triggered, so we delete that pair here.
 static void
@@ -74,7 +74,7 @@ SignalProxy_file_copy_async_callback(GObject*, GAsyncResult* res, void* data)
   delete slot_pair;
 }
 
-// Same as SignalProxy_async_callback, except that this one knows that
+// Same as giomm_SignalProxy_async_callback, except that this one knows that
 // the slot is packed in a pair. The operation is assumed to be finished
 // after the callback is triggered, so we delete that pair here.
 static void
@@ -123,7 +123,7 @@ SignalProxy_load_partial_contents_read_more_callback(
   return result;
 }
 
-// Same as SignalProxy_async_callback, except that this one knows that
+// Same as giomm_SignalProxy_async_callback, except that this one knows that
 // the slot is packed in a pair. The operation is assumed to be finished
 // after the callback is triggered, so we delete that pair here.
 static void
@@ -218,7 +218,7 @@ File::read_async(const SlotAsyncReady& slot, int io_priority)
   // and deleted in the callback.
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
-  g_file_read_async(gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+  g_file_read_async(gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -231,7 +231,7 @@ File::read_async(
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_read_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -244,7 +244,7 @@ File::append_to_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_append_to_async(gobj(), static_cast<GFileCreateFlags>(flags), io_priority,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -257,7 +257,7 @@ File::append_to_async(const SlotAsyncReady& slot, CreateFlags flags, int io_prio
 
   g_file_append_to_async(gobj(), static_cast<GFileCreateFlags>(flags), io_priority,
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -270,7 +270,7 @@ File::create_file_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellab
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_create_async(gobj(), static_cast<GFileCreateFlags>(flags), io_priority,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -283,7 +283,7 @@ File::create_file_async(const SlotAsyncReady& slot, CreateFlags flags, int io_pr
 
   g_file_create_async(gobj(), static_cast<GFileCreateFlags>(flags), io_priority,
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -296,7 +296,7 @@ File::create_file_readwrite_async(const SlotAsyncReady& slot,
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_create_async(gobj(), static_cast<GFileCreateFlags>(flags), io_priority,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -310,7 +310,7 @@ File::create_file_readwrite_async(
 
   g_file_create_readwrite_async(gobj(), static_cast<GFileCreateFlags>(flags), io_priority,
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -324,7 +324,7 @@ File::replace_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>&
 
   g_file_replace_async(gobj(), Glib::c_str_or_nullptr(etag), make_backup,
     static_cast<GFileCreateFlags>(flags), io_priority, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -339,7 +339,7 @@ File::replace_async(const SlotAsyncReady& slot, const std::string& etag, bool ma
   g_file_replace_async(gobj(), Glib::c_str_or_nullptr(etag), make_backup,
     static_cast<GFileCreateFlags>(flags), io_priority,
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -350,7 +350,7 @@ File::open_readwrite_async(const SlotAsyncReady& slot, int io_priority)
   // and deleted in the callback.
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
-  g_file_open_readwrite_async(gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+  g_file_open_readwrite_async(gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -363,7 +363,7 @@ File::open_readwrite_async(
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_open_readwrite_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -378,7 +378,7 @@ File::replace_readwrite_async(const SlotAsyncReady& slot,
 
   g_file_replace_readwrite_async(gobj(), Glib::c_str_or_nullptr(etag), make_backup,
     static_cast<GFileCreateFlags>(flags), io_priority, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -393,7 +393,7 @@ File::replace_readwrite_async(const SlotAsyncReady& slot, const std::string& eta
   g_file_replace_readwrite_async(gobj(), Glib::c_str_or_nullptr(etag), make_backup,
     static_cast<GFileCreateFlags>(flags), io_priority,
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 FileType
@@ -440,7 +440,7 @@ File::query_info_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellabl
 
   g_file_query_info_async(const_cast<GFile*>(gobj()), attributes.c_str(),
     static_cast<GFileQueryInfoFlags>(flags), io_priority, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -455,7 +455,7 @@ File::query_info_async(const SlotAsyncReady& slot, const std::string& attributes
   g_file_query_info_async(const_cast<GFile*>(gobj()), attributes.c_str(),
     static_cast<GFileQueryInfoFlags>(flags), io_priority,
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 Glib::RefPtr<FileInfo>
@@ -494,7 +494,7 @@ File::query_filesystem_info_async(const SlotAsyncReady& slot,
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_query_filesystem_info_async(const_cast<GFile*>(gobj()), attributes.c_str(), io_priority,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -508,7 +508,7 @@ File::query_filesystem_info_async(
 
   g_file_query_filesystem_info_async(const_cast<GFile*>(gobj()), attributes.c_str(), io_priority,
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 Glib::RefPtr<FileEnumerator>
@@ -549,7 +549,7 @@ File::enumerate_children_async(const SlotAsyncReady& slot,
 
   g_file_enumerate_children_async(gobj(), attributes.c_str(),
     static_cast<GFileQueryInfoFlags>(flags), io_priority, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -562,7 +562,7 @@ File::enumerate_children_async(const SlotAsyncReady& slot, const std::string& at
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_enumerate_children_async(gobj(), attributes.c_str(),
-    static_cast<GFileQueryInfoFlags>(flags), io_priority, nullptr, &SignalProxy_async_callback,
+    static_cast<GFileQueryInfoFlags>(flags), io_priority, nullptr, &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -576,7 +576,7 @@ File::set_display_name_async(const Glib::ustring& display_name, const SlotAsyncR
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_set_display_name_async(gobj(), display_name.c_str(), io_priority,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -589,7 +589,7 @@ File::set_display_name_async(
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_set_display_name_async(
-    gobj(), display_name.c_str(), io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), display_name.c_str(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 bool
@@ -677,7 +677,7 @@ File::copy_async(const Glib::RefPtr<File>& destination, const SlotAsyncReady& sl
   SlotAsyncReady* slot_ready_copy = new SlotAsyncReady(slot_ready);
 
   g_file_copy_async(gobj(), Glib::unwrap(destination), static_cast<GFileCopyFlags>(flags),
-    io_priority, Glib::unwrap(cancellable), nullptr, nullptr, &SignalProxy_async_callback,
+    io_priority, Glib::unwrap(cancellable), nullptr, nullptr, &giomm_SignalProxy_async_callback,
     slot_ready_copy);
 }
 
@@ -709,7 +709,7 @@ File::copy_async(const Glib::RefPtr<File>& destination, const SlotAsyncReady& sl
   SlotAsyncReady* slot_ready_copy = new SlotAsyncReady(slot_ready);
 
   g_file_copy_async(gobj(), Glib::unwrap(destination), static_cast<GFileCopyFlags>(flags),
-    io_priority, nullptr, nullptr, nullptr, &SignalProxy_async_callback, slot_ready_copy);
+    io_priority, nullptr, nullptr, nullptr, &giomm_SignalProxy_async_callback, slot_ready_copy);
 }
 
 bool
@@ -799,7 +799,7 @@ File::move_async(const Glib::RefPtr<File>& destination, const SlotAsyncReady& sl
   SlotAsyncReady* slot_ready_copy = new SlotAsyncReady(slot_ready);
 
   g_file_move_async(gobj(), Glib::unwrap(destination), static_cast<GFileCopyFlags>(flags),
-    io_priority, Glib::unwrap(cancellable), nullptr, nullptr, &SignalProxy_async_callback,
+    io_priority, Glib::unwrap(cancellable), nullptr, nullptr, &giomm_SignalProxy_async_callback,
     slot_ready_copy);
 }
 
@@ -831,7 +831,7 @@ File::move_async(const Glib::RefPtr<File>& destination, const SlotAsyncReady& sl
   SlotAsyncReady* slot_ready_copy = new SlotAsyncReady(slot_ready);
 
   g_file_move_async(gobj(), Glib::unwrap(destination), static_cast<GFileCopyFlags>(flags),
-    io_priority, nullptr, nullptr, nullptr, &SignalProxy_async_callback, slot_ready_copy);
+    io_priority, nullptr, nullptr, nullptr, &giomm_SignalProxy_async_callback, slot_ready_copy);
 }
 void
 File::set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncReady& slot,
@@ -843,7 +843,7 @@ File::set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncRe
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_set_attributes_async(gobj(), Glib::unwrap(info), static_cast<GFileQueryInfoFlags>(flags),
-    io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -856,7 +856,7 @@ File::set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncRe
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_set_attributes_async(gobj(), Glib::unwrap(info), static_cast<GFileQueryInfoFlags>(flags),
-    io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 bool
@@ -885,7 +885,7 @@ File::mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation,
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_mount_mountable(gobj(), static_cast<GMountMountFlags>(flags),
-    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &SignalProxy_async_callback,
+    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -899,7 +899,7 @@ File::mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation,
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_mount_mountable(gobj(), static_cast<GMountMountFlags>(flags),
-    Glib::unwrap(mount_operation), nullptr, &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(mount_operation), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -911,7 +911,7 @@ File::mount_mountable(const SlotAsyncReady& slot, Mount::MountFlags flags)
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_mount_mountable(gobj(), static_cast<GMountMountFlags>(flags), nullptr, nullptr,
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -931,7 +931,7 @@ File::unmount_mountable(
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_unmount_mountable_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags), nullptr,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -943,7 +943,7 @@ File::unmount_mountable(const SlotAsyncReady& slot, Mount::UnmountFlags flags)
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_unmount_mountable_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags), nullptr,
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -963,7 +963,7 @@ File::unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellab
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_unmount_mountable_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
-    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &SignalProxy_async_callback,
+    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -977,7 +977,7 @@ File::unmount_mountable(const SlotAsyncReady& slot,
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_unmount_mountable_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
-    Glib::unwrap(mount_operation), nullptr, &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(mount_operation), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -998,7 +998,7 @@ File::mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_mount_enclosing_volume(gobj(), static_cast<GMountMountFlags>(flags),
-    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &SignalProxy_async_callback,
+    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -1012,7 +1012,7 @@ File::mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_mount_enclosing_volume(gobj(), static_cast<GMountMountFlags>(flags),
-    Glib::unwrap(mount_operation), nullptr, &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(mount_operation), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1024,7 +1024,7 @@ File::mount_enclosing_volume(const SlotAsyncReady& slot, Mount::MountFlags flags
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_mount_enclosing_volume(gobj(), static_cast<GMountMountFlags>(flags), nullptr, nullptr,
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1044,7 +1044,7 @@ File::eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_eject_mountable_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
-    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &SignalProxy_async_callback,
+    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -1058,7 +1058,7 @@ File::eject_mountable(const SlotAsyncReady& slot,
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_eject_mountable_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
-    Glib::unwrap(mount_operation), nullptr, &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(mount_operation), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1078,7 +1078,7 @@ File::eject_mountable(
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_eject_mountable_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags), nullptr,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1090,7 +1090,7 @@ File::eject_mountable(const SlotAsyncReady& slot, Mount::UnmountFlags flags)
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_eject_mountable_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags), nullptr,
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1109,7 +1109,7 @@ File::load_contents_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancell
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_load_contents_async(
-    gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1120,7 +1120,7 @@ File::load_contents_async(const SlotAsyncReady& slot)
   // and deleted in the callback.
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
-  g_file_load_contents_async(gobj(), nullptr, &SignalProxy_async_callback, slot_copy);
+  g_file_load_contents_async(gobj(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1241,7 +1241,7 @@ File::replace_contents_async(const SlotAsyncReady& slot,
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_replace_contents_async(gobj(), contents, length, Glib::c_str_or_nullptr(etag), make_backup,
-    static_cast<GFileCreateFlags>(flags), Glib::unwrap(cancellable), &SignalProxy_async_callback,
+    static_cast<GFileCreateFlags>(flags), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -1255,7 +1255,7 @@ File::replace_contents_async(const SlotAsyncReady& slot, const char* contents, g
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_replace_contents_async(gobj(), contents, length, Glib::c_str_or_nullptr(etag), make_backup,
-    static_cast<GFileCreateFlags>(flags), nullptr, &SignalProxy_async_callback, slot_copy);
+    static_cast<GFileCreateFlags>(flags), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1270,7 +1270,7 @@ File::replace_contents_async(const SlotAsyncReady& slot,
 
   g_file_replace_contents_async(gobj(), contents.c_str(), contents.size(),
     Glib::c_str_or_nullptr(etag), make_backup, static_cast<GFileCreateFlags>(flags),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1284,7 +1284,7 @@ File::replace_contents_async(const SlotAsyncReady& slot, const std::string& cont
 
   g_file_replace_contents_async(gobj(), contents.c_str(), contents.size(),
     Glib::c_str_or_nullptr(etag), make_backup, static_cast<GFileCreateFlags>(flags), nullptr,
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1323,7 +1323,7 @@ File::replace_contents_bytes_async(const SlotAsyncReady& slot,
 
   g_file_replace_contents_bytes_async(gobj(), const_cast<GBytes*>(Glib::unwrap(contents)),
     Glib::c_str_or_nullptr(etag), make_backup, static_cast<GFileCreateFlags>(flags),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1338,7 +1338,7 @@ File::replace_contents_bytes_async(const SlotAsyncReady& slot,
 
   g_file_replace_contents_bytes_async(gobj(), const_cast<GBytes*>(Glib::unwrap(contents)),
     Glib::c_str_or_nullptr(etag), make_backup, static_cast<GFileCreateFlags>(flags), nullptr,
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 Glib::RefPtr<FileOutputStream>
@@ -1511,7 +1511,7 @@ File::start_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_start_mountable(gobj(), ((GDriveStartFlags)(flags)), Glib::unwrap(start_operation),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1524,7 +1524,7 @@ File::start_mountable(const SlotAsyncReady& slot,
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_start_mountable(gobj(), ((GDriveStartFlags)(flags)), Glib::unwrap(start_operation),
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1537,7 +1537,7 @@ File::stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_stop_mountable(gobj(), ((GMountUnmountFlags)(flags)), Glib::unwrap(start_operation),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1550,7 +1550,7 @@ File::stop_mountable(const SlotAsyncReady& slot,
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_stop_mountable(gobj(), ((GMountUnmountFlags)(flags)), Glib::unwrap(start_operation),
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1561,7 +1561,7 @@ File::poll_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>
   // and deleted in the callback.
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
-  g_file_poll_mountable(gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+  g_file_poll_mountable(gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1572,7 +1572,7 @@ File::poll_mountable(const SlotAsyncReady& slot)
   // and deleted in the callback.
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
-  g_file_poll_mountable(gobj(), nullptr, &SignalProxy_async_callback, slot_copy);
+  g_file_poll_mountable(gobj(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1585,7 +1585,7 @@ File::find_enclosing_mount_async(
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_find_enclosing_mount_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -1597,7 +1597,7 @@ File::find_enclosing_mount_async(const SlotAsyncReady& slot, int io_priority)
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_find_enclosing_mount_async(
-    gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 bool
@@ -1856,7 +1856,7 @@ File::remove_async(
   SlotAsyncReady* slot_ready_copy = new SlotAsyncReady(slot_ready);
 
   g_file_delete_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_ready_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_ready_copy);
 }
 
 void
@@ -1867,7 +1867,7 @@ File::remove_async(const SlotAsyncReady& slot_ready, int io_priority)
   // and deleted in the corresponding callback.
   SlotAsyncReady* slot_ready_copy = new SlotAsyncReady(slot_ready);
 
-  g_file_delete_async(gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_ready_copy);
+  g_file_delete_async(gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_ready_copy);
 }
 
 void
@@ -1880,7 +1880,7 @@ File::trash_async(
   SlotAsyncReady* slot_ready_copy = new SlotAsyncReady(slot_ready);
 
   g_file_trash_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_ready_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_ready_copy);
 }
 
 void
@@ -1891,7 +1891,7 @@ File::trash_async(const SlotAsyncReady& slot_ready, int io_priority)
   // and deleted in the corresponding callback.
   SlotAsyncReady* slot_ready_copy = new SlotAsyncReady(slot_ready);
 
-  g_file_trash_async(gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_ready_copy);
+  g_file_trash_async(gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_ready_copy);
 }
 
 void
@@ -1904,7 +1904,7 @@ File::make_directory_async(
   SlotAsyncReady* slot_ready_copy = new SlotAsyncReady(slot_ready);
 
   g_file_make_directory_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_ready_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_ready_copy);
 }
 
 void
@@ -1916,7 +1916,7 @@ File::make_directory_async(const SlotAsyncReady& slot_ready, int io_priority)
   SlotAsyncReady* slot_ready_copy = new SlotAsyncReady(slot_ready);
 
   g_file_make_directory_async(
-    gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_ready_copy);
+    gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_ready_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/file.hg b/gio/src/file.hg
index e4224f8c..aef8a028 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -1422,7 +1422,7 @@ public:
   _WRAP_METHOD(void make_symbolic_link_async(const std::string& symlink_value,
     const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.} = {},
     int io_priority{.} = Glib::PRIORITY_DEFAULT), g_file_make_symbolic_link_async,
-    slot_name slot, slot_callback SignalProxy_async_callback)
+    slot_name slot, slot_callback giomm_SignalProxy_async_callback)
 
   _WRAP_METHOD(bool make_symbolic_link_finish(const Glib::RefPtr<AsyncResult>& result),
     g_file_make_symbolic_link_finish, errthrow)
diff --git a/gio/src/fileenumerator.ccg b/gio/src/fileenumerator.ccg
index 58830c0c..18e3be7b 100644
--- a/gio/src/fileenumerator.ccg
+++ b/gio/src/fileenumerator.ccg
@@ -33,7 +33,7 @@ FileEnumerator::next_files_async(const SlotAsyncReady& slot,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_file_enumerator_next_files_async(gobj(), num_files, io_priority, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -46,7 +46,7 @@ FileEnumerator::next_files_async(const SlotAsyncReady& slot, int num_files, int
 
   g_file_enumerator_next_files_async(gobj(), num_files, io_priority,
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -59,7 +59,7 @@ FileEnumerator::close_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_file_enumerator_close_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -72,7 +72,7 @@ FileEnumerator::close_async(int io_priority, const SlotAsyncReady& slot)
 
   g_file_enumerator_close_async(gobj(), io_priority,
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/fileinputstream.ccg b/gio/src/fileinputstream.ccg
index 9bd02160..6d8b9a49 100644
--- a/gio/src/fileinputstream.ccg
+++ b/gio/src/fileinputstream.ccg
@@ -56,7 +56,7 @@ FileInputStream::query_info_async(const SlotAsyncReady& slot,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_file_input_stream_query_info_async(gobj(), const_cast<char*>(attributes.c_str()), io_priority,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -69,7 +69,7 @@ FileInputStream::query_info_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_file_input_stream_query_info_async(gobj(), const_cast<char*>(attributes.c_str()), io_priority,
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/fileiostream.ccg b/gio/src/fileiostream.ccg
index 32c4337a..a48cc787 100644
--- a/gio/src/fileiostream.ccg
+++ b/gio/src/fileiostream.ccg
@@ -56,7 +56,7 @@ FileIOStream::query_info_async(const SlotAsyncReady& slot,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_file_io_stream_query_info_async(gobj(), const_cast<char*>(attributes.c_str()), io_priority,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -69,7 +69,7 @@ FileIOStream::query_info_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_file_io_stream_query_info_async(gobj(), const_cast<char*>(attributes.c_str()), io_priority,
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/fileoutputstream.ccg b/gio/src/fileoutputstream.ccg
index a95ce4ec..a3d7042d 100644
--- a/gio/src/fileoutputstream.ccg
+++ b/gio/src/fileoutputstream.ccg
@@ -62,7 +62,7 @@ FileOutputStream::query_info_async(const SlotAsyncReady& slot,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_file_output_stream_query_info_async(gobj(), const_cast<char*>(attributes.c_str()), io_priority,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -75,7 +75,7 @@ FileOutputStream::query_info_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_file_output_stream_query_info_async(gobj(), const_cast<char*>(attributes.c_str()), io_priority,
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/inputstream.ccg b/gio/src/inputstream.ccg
index 35c15319..ef87db52 100644
--- a/gio/src/inputstream.ccg
+++ b/gio/src/inputstream.ccg
@@ -32,7 +32,7 @@ InputStream::read_async(void* buffer, gsize count, const SlotAsyncReady& slot,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_input_stream_read_async(gobj(), buffer, count, io_priority, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -44,7 +44,7 @@ InputStream::read_async(void* buffer, gsize count, const SlotAsyncReady& slot, i
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_input_stream_read_async(
-    gobj(), buffer, count, io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), buffer, count, io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -57,7 +57,7 @@ InputStream::read_all_async(void* buffer, gsize count, const SlotAsyncReady& slo
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_input_stream_read_all_async(gobj(), buffer, count, io_priority, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -69,7 +69,7 @@ InputStream::read_all_async(void* buffer, gsize count, const SlotAsyncReady& slo
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_input_stream_read_all_async(
-    gobj(), buffer, count, io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), buffer, count, io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -82,7 +82,7 @@ InputStream::read_bytes_async(gsize count, const SlotAsyncReady& slot,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_input_stream_read_bytes_async(
-    gobj(), count, io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), count, io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -94,7 +94,7 @@ InputStream::read_bytes_async(gsize count, const SlotAsyncReady& slot, int io_pr
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_input_stream_read_bytes_async(
-    gobj(), count, io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), count, io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -107,7 +107,7 @@ InputStream::skip_async(gsize count, const SlotAsyncReady& slot,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_input_stream_skip_async(
-    gobj(), count, io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), count, io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -119,7 +119,7 @@ InputStream::skip_async(gsize count, const SlotAsyncReady& slot, int io_priority
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_input_stream_skip_async(
-    gobj(), count, io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), count, io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -132,7 +132,7 @@ InputStream::close_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_input_stream_close_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -143,7 +143,7 @@ InputStream::close_async(const SlotAsyncReady& slot, int io_priority)
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_input_stream_close_async(gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+  g_input_stream_close_async(gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/iostream.ccg b/gio/src/iostream.ccg
index d26ca0e9..0615ec42 100644
--- a/gio/src/iostream.ccg
+++ b/gio/src/iostream.ccg
@@ -32,7 +32,7 @@ IOStream::close_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_io_stream_close_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -43,7 +43,7 @@ IOStream::close_async(const SlotAsyncReady& slot, int io_priority)
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_io_stream_close_async(gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+  g_io_stream_close_async(gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -56,7 +56,7 @@ IOStream::splice_async(const Glib::RefPtr<IOStream>& stream2, const SlotAsyncRea
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_io_stream_splice_async(gobj(), Glib::unwrap(stream2), static_cast<GIOStreamSpliceFlags>(flags),
-    io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -69,7 +69,7 @@ IOStream::splice_async(const Glib::RefPtr<IOStream>& stream2, const SlotAsyncRea
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_io_stream_splice_async(gobj(), Glib::unwrap(stream2), static_cast<GIOStreamSpliceFlags>(flags),
-    io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/loadableicon.ccg b/gio/src/loadableicon.ccg
index 3641c7c0..71a553c0 100644
--- a/gio/src/loadableicon.ccg
+++ b/gio/src/loadableicon.ccg
@@ -64,7 +64,7 @@ LoadableIcon::load_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_loadable_icon_load_async(
-    gobj(), size, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), size, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -75,7 +75,7 @@ LoadableIcon::load_async(int size, const SlotAsyncReady& slot)
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_loadable_icon_load_async(gobj(), size, nullptr, &SignalProxy_async_callback, slot_copy);
+  g_loadable_icon_load_async(gobj(), size, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/mount.ccg b/gio/src/mount.ccg
index a989b866..7088dd1d 100644
--- a/gio/src/mount.ccg
+++ b/gio/src/mount.ccg
@@ -35,7 +35,7 @@ Mount::unmount(
 
   g_mount_unmount_with_operation(gobj(), GMountUnmountFlags(flags),
     nullptr, // mount_operation
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -49,7 +49,7 @@ Mount::unmount(const SlotAsyncReady& slot, UnmountFlags flags)
   g_mount_unmount_with_operation(gobj(), GMountUnmountFlags(flags),
     nullptr, // mount_operation
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -72,7 +72,7 @@ Mount::unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAs
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_mount_unmount_with_operation(gobj(), GMountUnmountFlags(flags), Glib::unwrap(mount_operation),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -86,7 +86,7 @@ Mount::unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAs
 
   g_mount_unmount_with_operation(gobj(), GMountUnmountFlags(flags), Glib::unwrap(mount_operation),
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -108,7 +108,7 @@ Mount::remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncRea
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_mount_remount(gobj(), static_cast<GMountMountFlags>(flags), Glib::unwrap(operation),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -121,7 +121,7 @@ Mount::remount(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_mount_remount(gobj(), static_cast<GMountMountFlags>(flags), Glib::unwrap(operation), nullptr,
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -148,7 +148,7 @@ Mount::eject(
 
   g_mount_eject_with_operation(gobj(), GMountUnmountFlags(flags),
     nullptr, // mount_operation
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -162,7 +162,7 @@ Mount::eject(const SlotAsyncReady& slot, UnmountFlags flags)
   g_mount_eject_with_operation(gobj(), GMountUnmountFlags(flags),
     nullptr, // mount_operation
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -185,7 +185,7 @@ Mount::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyn
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_mount_eject_with_operation(gobj(), GMountUnmountFlags(flags), Glib::unwrap(mount_operation),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -199,7 +199,7 @@ Mount::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyn
 
   g_mount_eject_with_operation(gobj(), GMountUnmountFlags(flags), Glib::unwrap(mount_operation),
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -221,7 +221,7 @@ Mount::guess_content_type(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_mount_guess_content_type(
-    gobj(), force_rescan, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), force_rescan, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -232,7 +232,7 @@ Mount::guess_content_type(const SlotAsyncReady& slot, bool force_rescan)
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_mount_guess_content_type(gobj(), force_rescan, nullptr, &SignalProxy_async_callback, slot_copy);
+  g_mount_guess_content_type(gobj(), force_rescan, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
diff --git a/gio/src/networkmonitor.ccg b/gio/src/networkmonitor.ccg
index 78976614..0cef30da 100644
--- a/gio/src/networkmonitor.ccg
+++ b/gio/src/networkmonitor.ccg
@@ -31,7 +31,7 @@ NetworkMonitor::can_reach_async(const Glib::RefPtr<SocketConnectable>& connectab
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_network_monitor_can_reach_async(gobj(), Glib::unwrap(connectable), Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/outputstream.ccg b/gio/src/outputstream.ccg
index e340c2a1..268edade 100644
--- a/gio/src/outputstream.ccg
+++ b/gio/src/outputstream.ccg
@@ -34,7 +34,7 @@ OutputStream::write_async(const void* buffer, gsize count, const SlotAsyncReady&
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_output_stream_write_async(gobj(), buffer, count, io_priority, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -47,7 +47,7 @@ OutputStream::write_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_output_stream_write_async(
-    gobj(), buffer, count, io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), buffer, count, io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -60,7 +60,7 @@ OutputStream::write_all_async(const void* buffer, gsize count, const SlotAsyncRe
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_output_stream_write_all_async(gobj(), buffer, count, io_priority, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -73,7 +73,7 @@ OutputStream::write_all_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_output_stream_write_all_async(
-    gobj(), buffer, count, io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), buffer, count, io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -87,7 +87,7 @@ OutputStream::splice_async(const Glib::RefPtr<InputStream>& source, const SlotAs
 
   g_output_stream_splice_async(gobj(), Glib::unwrap(source),
     static_cast<GOutputStreamSpliceFlags>(flags), io_priority, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -100,7 +100,7 @@ OutputStream::splice_async(const Glib::RefPtr<InputStream>& source, const SlotAs
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_output_stream_splice_async(gobj(), Glib::unwrap(source),
-    static_cast<GOutputStreamSpliceFlags>(flags), io_priority, nullptr, &SignalProxy_async_callback,
+    static_cast<GOutputStreamSpliceFlags>(flags), io_priority, nullptr, &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -114,7 +114,7 @@ OutputStream::flush_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_output_stream_flush_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -125,7 +125,7 @@ OutputStream::flush_async(const SlotAsyncReady& slot, int io_priority)
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_output_stream_flush_async(gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+  g_output_stream_flush_async(gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -138,7 +138,7 @@ OutputStream::close_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_output_stream_close_async(
-    gobj(), io_priority, Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), io_priority, Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -149,7 +149,7 @@ OutputStream::close_async(const SlotAsyncReady& slot, int io_priority)
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_output_stream_close_async(gobj(), io_priority, nullptr, &SignalProxy_async_callback, slot_copy);
+  g_output_stream_close_async(gobj(), io_priority, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 gssize
@@ -210,7 +210,7 @@ OutputStream::write_bytes_async(const Glib::RefPtr<const Glib::Bytes>& bytes,
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_output_stream_write_bytes_async(gobj(), const_cast<GBytes*>(Glib::unwrap(bytes)), io_priority,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -223,7 +223,7 @@ OutputStream::write_bytes_async(
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_output_stream_write_bytes_async(gobj(), const_cast<GBytes*>(Glib::unwrap(bytes)), io_priority,
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 gssize
diff --git a/gio/src/permission.hg b/gio/src/permission.hg
index b6b939da..47f5a4f1 100644
--- a/gio/src/permission.hg
+++ b/gio/src/permission.hg
@@ -52,11 +52,11 @@ class GIOMM_API Permission : public Glib::Object
 public:
 
   _WRAP_METHOD(bool acquire(const Glib::RefPtr<Cancellable>& cancellable{?}), g_permission_acquire, errthrow)
-  _WRAP_METHOD(void acquire_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}), g_permission_acquire_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_METHOD(void acquire_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}), g_permission_acquire_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(bool acquire_finish(const Glib::RefPtr<AsyncResult>& result), g_permission_acquire_finish, errthrow)
 
   _WRAP_METHOD(bool release(const Glib::RefPtr<Cancellable>& cancellable{?}), g_permission_release, errthrow)
-  _WRAP_METHOD(void release_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}), g_permission_release_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_METHOD(void release_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}), g_permission_release_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(bool release_finish(const Glib::RefPtr<AsyncResult>& result), g_permission_release_finish, errthrow)
 
   _WRAP_METHOD(bool get_allowed() const, g_permission_get_allowed)
@@ -76,11 +76,11 @@ protected:
 #m4 _CONVERSION(`GCancellable*',`const Glib::RefPtr<Cancellable>&',`Glib::wrap($3, true)')
 
   _WRAP_VFUNC(bool acquire(const Glib::RefPtr<Cancellable>& cancellable), acquire, errthrow)
-  _WRAP_VFUNC(void acquire_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}), acquire_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_VFUNC(void acquire_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}), acquire_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_VFUNC(bool acquire_finish(const Glib::RefPtr<AsyncResult>& result), acquire_finish, errthrow)
 
   _WRAP_VFUNC(bool release(const Glib::RefPtr<Cancellable>& cancellable), release, errthrow)
-  _WRAP_VFUNC(void release_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}), release_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_VFUNC(void release_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}), release_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_VFUNC(bool release_finish(const Glib::RefPtr<AsyncResult>& result), release_finish, errthrow)
 
   // You should never call this function except from a Gio::Permission implementation.
diff --git a/gio/src/proxy.ccg b/gio/src/proxy.ccg
index 7331996f..19efb6ae 100644
--- a/gio/src/proxy.ccg
+++ b/gio/src/proxy.ccg
@@ -35,7 +35,7 @@ Proxy::connect_async(const Glib::RefPtr<IOStream>& connection,
 
   g_proxy_connect_async(gobj(), Glib::unwrap(connection),
     const_cast<GProxyAddress*>(Glib::unwrap(proxy_address)), Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -48,7 +48,7 @@ Proxy::connect_async(const Glib::RefPtr<IOStream>& connection,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_proxy_connect_async(gobj(), Glib::unwrap(connection),
-    const_cast<GProxyAddress*>(Glib::unwrap(proxy_address)), nullptr, &SignalProxy_async_callback,
+    const_cast<GProxyAddress*>(Glib::unwrap(proxy_address)), nullptr, &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
diff --git a/gio/src/proxyresolver.ccg b/gio/src/proxyresolver.ccg
index d68b0ccb..be5ce7ae 100644
--- a/gio/src/proxyresolver.ccg
+++ b/gio/src/proxyresolver.ccg
@@ -46,7 +46,7 @@ ProxyResolver::lookup_async(const Glib::ustring& uri, const SlotAsyncReady& slot
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_proxy_resolver_lookup_async(
-    gobj(), uri.c_str(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), uri.c_str(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -58,7 +58,7 @@ ProxyResolver::lookup_async(const Glib::ustring& uri, const SlotAsyncReady& slot
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_proxy_resolver_lookup_async(
-    gobj(), uri.c_str(), nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), uri.c_str(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/resolver.ccg b/gio/src/resolver.ccg
index 12390313..da83bf4a 100644
--- a/gio/src/resolver.ccg
+++ b/gio/src/resolver.ccg
@@ -56,7 +56,7 @@ Resolver::lookup_by_name_async(const Glib::ustring& hostname, const SlotAsyncRea
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_resolver_lookup_by_name_async(
-    gobj(), hostname.c_str(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), hostname.c_str(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -65,7 +65,7 @@ Resolver::lookup_by_name_async(const Glib::ustring& hostname, const SlotAsyncRea
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_resolver_lookup_by_name_async(
-    gobj(), hostname.c_str(), nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), hostname.c_str(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -75,7 +75,7 @@ Resolver::lookup_by_address_async(const Glib::RefPtr<InetAddress>& address,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_resolver_lookup_by_address_async(gobj(), Glib::unwrap(address), Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -85,7 +85,7 @@ Resolver::lookup_by_address_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_resolver_lookup_by_address_async(
-    gobj(), Glib::unwrap(address), nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), Glib::unwrap(address), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -96,7 +96,7 @@ Resolver::lookup_service_async(const Glib::ustring& service, const Glib::ustring
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_resolver_lookup_service_async(gobj(), service.c_str(), protocol.c_str(), domain.c_str(),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -106,7 +106,7 @@ Resolver::lookup_service_async(const Glib::ustring& service, const Glib::ustring
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_resolver_lookup_service_async(gobj(), service.c_str(), protocol.c_str(), domain.c_str(),
-    nullptr, &SignalProxy_async_callback, slot_copy);
+    nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -117,7 +117,7 @@ Resolver::lookup_records_async(const Glib::ustring& rrname, RecordType record_ty
 
   g_resolver_lookup_records_async(gobj(), Glib::c_str_or_nullptr(rrname),
     static_cast<GResolverRecordType>(record_type), Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -127,7 +127,7 @@ Resolver::lookup_records_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_resolver_lookup_records_async(gobj(), Glib::c_str_or_nullptr(rrname),
-    static_cast<GResolverRecordType>(record_type), nullptr, &SignalProxy_async_callback, slot_copy);
+    static_cast<GResolverRecordType>(record_type), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 std::string
diff --git a/gio/src/resolver.hg b/gio/src/resolver.hg
index 1fc983d0..f8e09923 100644
--- a/gio/src/resolver.hg
+++ b/gio/src/resolver.hg
@@ -98,7 +98,7 @@ public:
   _WRAP_METHOD(void lookup_by_name_with_flags_async(const Glib::ustring& hostname,
     NameLookupFlags flags, const SlotAsyncReady& slot{callback},
     const Glib::RefPtr<Cancellable>& cancellable{.} = {}), g_resolver_lookup_by_name_with_flags_async,
-    slot_name slot, slot_callback SignalProxy_async_callback, newin "2,74")
+    slot_name slot, slot_callback giomm_SignalProxy_async_callback, newin "2,74")
 
   _WRAP_METHOD(std::vector<Glib::RefPtr<InetAddress>> lookup_by_name_with_flags_finish(
     const Glib::RefPtr<AsyncResult>& result), g_resolver_lookup_by_name_with_flags_finish,
diff --git a/gio/src/socketaddressenumerator.ccg b/gio/src/socketaddressenumerator.ccg
index 4e4e921d..278a8bfa 100644
--- a/gio/src/socketaddressenumerator.ccg
+++ b/gio/src/socketaddressenumerator.ccg
@@ -32,7 +32,7 @@ SocketAddressEnumerator::next_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_address_enumerator_next_async(
-    gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/socketclient.ccg b/gio/src/socketclient.ccg
index 8f17c65d..b540bdfb 100644
--- a/gio/src/socketclient.ccg
+++ b/gio/src/socketclient.ccg
@@ -31,7 +31,7 @@ SocketClient::connect_async(const Glib::RefPtr<SocketConnectable>& connectable,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_client_connect_async(
-    gobj(), connectable->gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), connectable->gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -40,11 +40,11 @@ SocketClient::connect_async(
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
-  // and deleted in the callback.
+  // and deleted in the callback.SignalProxy_async_callback
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_client_connect_async(
-    gobj(), connectable->gobj(), nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), connectable->gobj(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -57,7 +57,7 @@ SocketClient::connect_to_host_async(const Glib::ustring& host_and_port, guint16
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_client_connect_to_host_async(gobj(), host_and_port.c_str(), default_port,
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -70,7 +70,7 @@ SocketClient::connect_to_host_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_client_connect_to_host_async(
-    gobj(), host_and_port.c_str(), default_port, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), host_and_port.c_str(), default_port, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -83,7 +83,7 @@ SocketClient::connect_to_service_async(const Glib::ustring& domain, const Glib::
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_client_connect_to_service_async(gobj(), domain.c_str(), service.c_str(),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -96,7 +96,7 @@ SocketClient::connect_to_service_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_client_connect_to_service_async(
-    gobj(), domain.c_str(), service.c_str(), nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), domain.c_str(), service.c_str(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -109,7 +109,7 @@ SocketClient::connect_to_uri_async(const Glib::ustring& uri, guint16 default_por
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_client_connect_to_uri_async(gobj(), uri.c_str(), default_port, Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -122,7 +122,7 @@ SocketClient::connect_to_uri_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_client_connect_to_uri_async(
-    gobj(), uri.c_str(), default_port, nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), uri.c_str(), default_port, nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/socketconnection.ccg b/gio/src/socketconnection.ccg
index b4fb3d76..99a1e3c5 100644
--- a/gio/src/socketconnection.ccg
+++ b/gio/src/socketconnection.ccg
@@ -27,7 +27,7 @@ SocketConnection::connect_async(const Glib::RefPtr<SocketAddress>& address,
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_connection_connect_async(gobj(), Glib::unwrap(address), Glib::unwrap(cancellable),
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -37,7 +37,7 @@ SocketConnection::connect_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_connection_connect_async(
-    gobj(), Glib::unwrap(address), nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), Glib::unwrap(address), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/socketlistener.ccg b/gio/src/socketlistener.ccg
index df6d582a..e1260bde 100644
--- a/gio/src/socketlistener.ccg
+++ b/gio/src/socketlistener.ccg
@@ -156,7 +156,7 @@ SocketListener::accept_socket_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_listener_accept_socket_async(
-    gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -167,7 +167,7 @@ SocketListener::accept_socket_async(const SlotAsyncReady& slot)
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_socket_listener_accept_socket_async(gobj(), nullptr, &SignalProxy_async_callback, slot_copy);
+  g_socket_listener_accept_socket_async(gobj(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 Glib::RefPtr<Socket>
@@ -259,7 +259,7 @@ SocketListener::accept_async(const SlotAsyncReady& slot)
   // and deleted in the callback.
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_socket_listener_accept_async(gobj(), nullptr, &SignalProxy_async_callback, slot_copy);
+  g_socket_listener_accept_async(gobj(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -272,7 +272,7 @@ SocketListener::accept_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_socket_listener_accept_async(
-    gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 Glib::RefPtr<SocketConnection>
diff --git a/gio/src/tlsconnection.hg b/gio/src/tlsconnection.hg
index c76c5dc1..a56f708c 100644
--- a/gio/src/tlsconnection.hg
+++ b/gio/src/tlsconnection.hg
@@ -75,7 +75,8 @@ public:
 
   _WRAP_METHOD(bool handshake(const Glib::RefPtr<Cancellable>& cancellable{?}), g_tls_connection_handshake, errthrow)
 
-  _WRAP_METHOD(void handshake_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}, int io_priority{.} = Glib::PRIORITY_DEFAULT), g_tls_connection_handshake_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_METHOD(void handshake_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?},
+    int io_priority{.} = Glib::PRIORITY_DEFAULT), g_tls_connection_handshake_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(bool handshake_finish(const Glib::RefPtr<AsyncResult>& result), g_tls_connection_handshake_finish, errthrow)
 
   _WRAP_METHOD(TlsProtocolVersion get_protocol_version() const, g_tls_connection_get_protocol_version)
@@ -99,7 +100,8 @@ public:
 
 protected:
   _WRAP_VFUNC(bool handshake(const Glib::RefPtr<Cancellable>& cancellable), "handshake", errthrow)
-  _WRAP_VFUNC(void handshake_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}, int io_priority{.} = Glib::PRIORITY_DEFAULT), "handshake_async", slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_VFUNC(void handshake_async(const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.},
+    int io_priority{.} = Glib::PRIORITY_DEFAULT), "handshake_async", slot_name slot, slot_callback giomm_SignalProxy_async_callback)
 
 #m4 _CONVERSION(`GAsyncResult*',`const Glib::RefPtr<AsyncResult>&',`Glib::wrap($3, true)')
   _WRAP_VFUNC(bool handshake_finish(const Glib::RefPtr<AsyncResult>& result), "handshake_finish", errthrow)
diff --git a/gio/src/tlsdatabase.hg b/gio/src/tlsdatabase.hg
index 9b8cf6a3..2da76d0d 100644
--- a/gio/src/tlsdatabase.hg
+++ b/gio/src/tlsdatabase.hg
@@ -61,13 +61,19 @@ public:
   _WRAP_ENUM(LookupFlags, GTlsDatabaseLookupFlags, decl_prefix GIOMM_API)
 
   _WRAP_METHOD(TlsCertificateFlags verify_chain(const Glib::RefPtr<TlsCertificate>& chain, const Glib::ustring& purpose, const Glib::RefPtr<const SocketConnectable>& identity{?}, const Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?}, VerifyFlags flags{.} = VerifyFlags::NONE) const, g_tls_database_verify_chain, errthrow)
-  _WRAP_METHOD(void verify_chain_async(const Glib::RefPtr<TlsCertificate>& chain, const Glib::ustring& purpose, const Glib::RefPtr<const SocketConnectable>& identity{?}, const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}, VerifyFlags flags{.} = VerifyFlags::NONE) const, g_tls_database_verify_chain_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_METHOD(void verify_chain_async(const Glib::RefPtr<TlsCertificate>& chain, const Glib::ustring& purpose,
+    const Glib::RefPtr<const SocketConnectable>& identity{?}, const Glib::RefPtr<TlsInteraction>& interaction{?},
+    const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}, VerifyFlags flags{.} = VerifyFlags::NONE) const,
+    g_tls_database_verify_chain_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(TlsCertificateFlags verify_chain_finish(const Glib::RefPtr<AsyncResult>& result), g_tls_database_verify_chain_finish, errthrow)
 
   _WRAP_METHOD(Glib::RefPtr<TlsCertificate> lookup_certificate_issuer(const Glib::RefPtr<const TlsCertificate>& certificate, const Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE), g_tls_database_lookup_certificate_issuer, errthrow)
   _WRAP_METHOD(Glib::RefPtr<const TlsCertificate> lookup_certificate_issuer(const Glib::RefPtr<const TlsCertificate>& certificate, const Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE) const, g_tls_database_lookup_certificate_issuer, errthrow, constversion)
 
-  _WRAP_METHOD(void lookup_certificate_issuer_async(const Glib::RefPtr<const TlsCertificate>& certificate, const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE), g_tls_database_lookup_certificate_issuer_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_METHOD(void lookup_certificate_issuer_async(const Glib::RefPtr<const TlsCertificate>& certificate,
+    const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback},
+    const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE),
+    g_tls_database_lookup_certificate_issuer_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(Glib::RefPtr<TlsCertificate> lookup_certificate_issuer_finish(const Glib::RefPtr<AsyncResult>& result), g_tls_database_lookup_certificate_issuer_finish, errthrow)
 
 #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<TlsCertificate> >',`Glib::ListHandler< Glib::RefPtr<TlsCertificate> >::list_to_vector($3, Glib::OWNERSHIP_DEEP)')
@@ -76,7 +82,10 @@ public:
 #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<const TlsCertificate> >',`Glib::ListHandler< Glib::RefPtr<const TlsCertificate> >::list_to_vector($3, Glib::OWNERSHIP_DEEP)')
   _WRAP_METHOD(std::vector< Glib::RefPtr<const TlsCertificate> > lookup_certificates_issued_by(const Glib::RefPtr<Glib::ByteArray>& issuer_raw_dn, const Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE) const, g_tls_database_lookup_certificates_issued_by, errthrow)
 
-  _WRAP_METHOD(void lookup_certificates_issued_by_async(const Glib::RefPtr<Glib::ByteArray>& issuer_raw_dn, const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE), g_tls_database_lookup_certificates_issued_by_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_METHOD(void lookup_certificates_issued_by_async(const Glib::RefPtr<Glib::ByteArray>& issuer_raw_dn,
+    const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback},
+    const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE),
+    g_tls_database_lookup_certificates_issued_by_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(std::vector< Glib::RefPtr<TlsCertificate> > lookup_certificates_issued_by_finish(const Glib::RefPtr<AsyncResult>& result), g_tls_database_lookup_certificates_issued_by_finish, errthrow)
 
   _WRAP_METHOD(Glib::ustring create_certificate_handle(const Glib::RefPtr<const TlsCertificate>& certificate) const, g_tls_database_create_certificate_handle)
@@ -84,7 +93,9 @@ public:
   _WRAP_METHOD(Glib::RefPtr<TlsCertificate> lookup_certificate_for_handle(const Glib::ustring& handle, const Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE), g_tls_database_lookup_certificate_for_handle, errthrow)
   _WRAP_METHOD(Glib::RefPtr<const TlsCertificate> lookup_certificate_for_handle(const Glib::ustring& handle, const Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE) const, g_tls_database_lookup_certificate_for_handle, errthrow, constversion)
 
-  _WRAP_METHOD(void lookup_certificate_for_handle_async(const Glib::ustring& handle, const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE), g_tls_database_lookup_certificate_for_handle_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_METHOD(void lookup_certificate_for_handle_async(const Glib::ustring& handle, const Glib::RefPtr<TlsInteraction>& interaction{?},
+    const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}, LookupFlags flags{.} = LookupFlags::NONE),
+    g_tls_database_lookup_certificate_for_handle_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(Glib::RefPtr<TlsCertificate> lookup_certificate_for_handle_finish(const Glib::RefPtr<AsyncResult>& result), g_tls_database_lookup_certificate_for_handle_finish, errthrow)
 
 protected:
@@ -93,7 +104,10 @@ protected:
 #m4 _CONVERSION(`GTlsInteraction*',`const Glib::RefPtr<TlsInteraction>&',`Glib::wrap($3, true)')
 
   _WRAP_VFUNC(TlsCertificateFlags verify_chain(const Glib::RefPtr<TlsCertificate>& chain, const Glib::ustring& purpose, const Glib::RefPtr<const SocketConnectable>& identity, const Glib::RefPtr<TlsInteraction>& interaction, const Glib::RefPtr<Cancellable>& cancellable{.}, VerifyFlags flags{.}) const, "verify_chain", errthrow)
-  _WRAP_VFUNC(void verify_chain_async(const Glib::RefPtr<TlsCertificate>& chain, const Glib::ustring& purpose, const Glib::RefPtr<const SocketConnectable>& identity, const Glib::RefPtr<TlsInteraction>& interaction, const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}, VerifyFlags flags{.}) const, "verify_chain_async", slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_VFUNC(void verify_chain_async(const Glib::RefPtr<TlsCertificate>& chain, const Glib::ustring& purpose,
+    const Glib::RefPtr<const SocketConnectable>& identity, const Glib::RefPtr<TlsInteraction>& interaction,
+    const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}, VerifyFlags flags{.}) const,
+    "verify_chain_async", slot_name slot, slot_callback giomm_SignalProxy_async_callback)
 
 #m4 _CONVERSION(`GAsyncResult*',`const Glib::RefPtr<AsyncResult>&',`Glib::wrap($3, true)')
 
@@ -114,7 +128,7 @@ dnl// because that could be caused by an intermediate empty ustring from an init
   _WRAP_VFUNC(void lookup_certificate_for_handle_async(
     const Glib::ustring& handle, const Glib::RefPtr<TlsInteraction>& interaction,
     const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}, LookupFlags flags{.}),
-    "lookup_certificate_for_handle_async", slot_name slot, slot_callback SignalProxy_async_callback)
+    "lookup_certificate_for_handle_async", slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_VFUNC(Glib::RefPtr<TlsCertificate> lookup_certificate_for_handle_finish(
     const Glib::RefPtr<AsyncResult>& result), "lookup_certificate_for_handle_finish", errthrow, refreturn_ctype)
 
@@ -125,7 +139,7 @@ dnl// because that could be caused by an intermediate empty ustring from an init
   _WRAP_VFUNC(void lookup_certificate_issuer_async(
     const Glib::RefPtr<TlsCertificate>& certificate, const Glib::RefPtr<TlsInteraction>& interaction,
     const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}, LookupFlags flags{.}),
-    "lookup_certificate_issuer_async", slot_name slot, slot_callback SignalProxy_async_callback)
+    "lookup_certificate_issuer_async", slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_VFUNC(Glib::RefPtr<TlsCertificate> lookup_certificate_issuer_finish(
     const Glib::RefPtr<AsyncResult>& result), "lookup_certificate_issuer_finish", errthrow, refreturn_ctype)
 
@@ -139,7 +153,7 @@ dnl// because that could be caused by an intermediate empty ustring from an init
   _WRAP_VFUNC(void lookup_certificates_issued_by_async(
     const Glib::RefPtr<Glib::ByteArray>& issuer_raw_dn, const Glib::RefPtr<TlsInteraction>& interaction,
     const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}, LookupFlags flags{.}),
-    "lookup_certificates_issued_by_async", slot_name slot, slot_callback SignalProxy_async_callback)
+    "lookup_certificates_issued_by_async", slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_VFUNC(std::vector< Glib::RefPtr<TlsCertificate> > lookup_certificates_issued_by_finish(
     const Glib::RefPtr<AsyncResult>& result), "lookup_certificates_issued_by_finish", errthrow)
 };
diff --git a/gio/src/tlsinteraction.hg b/gio/src/tlsinteraction.hg
index 5a67b86c..3d7d0795 100644
--- a/gio/src/tlsinteraction.hg
+++ b/gio/src/tlsinteraction.hg
@@ -62,7 +62,9 @@ protected:
 
 public:
   _WRAP_METHOD(TlsInteractionResult ask_password(const Glib::RefPtr<TlsPassword>& password, const Glib::RefPtr<Cancellable>& cancellable{?}), g_tls_interaction_ask_password, errthrow)
-  _WRAP_METHOD(void ask_password_async(const Glib::RefPtr<TlsPassword>& password, const SlotAsyncReady& slot{callback?}, const Glib::RefPtr<Cancellable>& cancellable{.?}), g_tls_interaction_ask_password_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_METHOD(void ask_password_async(const Glib::RefPtr<TlsPassword>& password,
+    const SlotAsyncReady& slot{callback?}, const Glib::RefPtr<Cancellable>& cancellable{.?}),
+    g_tls_interaction_ask_password_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
   _WRAP_METHOD(TlsInteractionResult ask_password_finish(const Glib::RefPtr<AsyncResult>& result), g_tls_interaction_ask_password_finish, errthrow)
   _WRAP_METHOD(TlsInteractionResult invoke_ask_password(const Glib::RefPtr<TlsPassword>& password, const Glib::RefPtr<Cancellable>& cancellable{?}), g_tls_interaction_invoke_ask_password, errthrow)
 
@@ -70,14 +72,18 @@ public:
 
   _WRAP_METHOD(TlsInteractionResult request_certificate(const Glib::RefPtr<TlsConnection>& connection, TlsCertificateRequestFlags flags, const Glib::RefPtr<Cancellable>& cancellable{?}), g_tls_interaction_request_certificate, errthrow)
 
-  _WRAP_METHOD(void request_certificate_async(const Glib::RefPtr<TlsConnection>& connection, TlsCertificateRequestFlags flags, const SlotAsyncReady& slot{callback?}, const Glib::RefPtr<Cancellable>& cancellable{.?}), g_tls_interaction_request_certificate_async, slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_METHOD(void request_certificate_async(const Glib::RefPtr<TlsConnection>& connection,
+    TlsCertificateRequestFlags flags, const SlotAsyncReady& slot{callback?}, const Glib::RefPtr<Cancellable>& cancellable{.?}),
+    g_tls_interaction_request_certificate_async, slot_name slot, slot_callback giomm_SignalProxy_async_callback)
 
   _WRAP_METHOD(TlsInteractionResult request_certificate_finish(const Glib::RefPtr<AsyncResult>& result), g_tls_interaction_request_certificate_finish, errthrow)
 
 protected:
 #m4 _CONVERSION(`GTlsPassword*',`const Glib::RefPtr<TlsPassword>&',`Glib::wrap($3, true)')
   _WRAP_VFUNC(TlsInteractionResult ask_password(const Glib::RefPtr<TlsPassword>& password, const Glib::RefPtr<Cancellable>& cancellable), "ask_password", errthrow)
-  _WRAP_VFUNC(void ask_password_async(const Glib::RefPtr<TlsPassword>& password, const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}), "ask_password_async", slot_name slot, slot_callback SignalProxy_async_callback)
+  _WRAP_VFUNC(void ask_password_async(const Glib::RefPtr<TlsPassword>& password,
+    const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}),
+    "ask_password_async", slot_name slot, slot_callback giomm_SignalProxy_async_callback)
 
 #m4 _CONVERSION(`GAsyncResult*',`const Glib::RefPtr<AsyncResult>&',`Glib::wrap($3, true)')
   _WRAP_VFUNC(TlsInteractionResult ask_password_finish(const Glib::RefPtr<AsyncResult>& result), "ask_password_finish", errthrow)
diff --git a/gio/src/unixconnection.ccg b/gio/src/unixconnection.ccg
index b3ec278d..00ee1e53 100644
--- a/gio/src/unixconnection.ccg
+++ b/gio/src/unixconnection.ccg
@@ -28,7 +28,7 @@ UnixConnection::receive_credentials_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_unix_connection_receive_credentials_async(
-    gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -37,7 +37,7 @@ UnixConnection::receive_credentials_async(const SlotAsyncReady& slot)
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_unix_connection_receive_credentials_async(
-    gobj(), nullptr, &SignalProxy_async_callback, slot_copy);
+    gobj(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -47,7 +47,7 @@ UnixConnection::send_credentials_async(
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_unix_connection_send_credentials_async(
-    gobj(), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    gobj(), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -56,7 +56,7 @@ UnixConnection::send_credentials_async(const SlotAsyncReady& slot)
 {
   auto slot_copy = new SlotAsyncReady(slot);
 
-  g_unix_connection_send_credentials_async(gobj(), nullptr, &SignalProxy_async_callback, slot_copy);
+  g_unix_connection_send_credentials_async(gobj(), nullptr, &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 } // namespace Gio
diff --git a/gio/src/volume.ccg b/gio/src/volume.ccg
index c3734d65..5a137de5 100644
--- a/gio/src/volume.ccg
+++ b/gio/src/volume.ccg
@@ -34,7 +34,7 @@ Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsy
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_volume_mount(gobj(), static_cast<GMountMountFlags>(flags), Glib::unwrap(mount_operation),
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -48,7 +48,7 @@ Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsy
 
   g_volume_mount(gobj(), static_cast<GMountMountFlags>(flags), Glib::unwrap(mount_operation),
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -78,7 +78,7 @@ Volume::eject(
 
   g_volume_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     nullptr, // mount_operation
-    Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy);
+    Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -92,7 +92,7 @@ Volume::eject(const SlotAsyncReady& slot, Mount::UnmountFlags flags)
   g_volume_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     nullptr, // mount_operation
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
@@ -115,7 +115,7 @@ Volume::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsy
   auto slot_copy = new SlotAsyncReady(slot);
 
   g_volume_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
-    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &SignalProxy_async_callback,
+    Glib::unwrap(mount_operation), Glib::unwrap(cancellable), &giomm_SignalProxy_async_callback,
     slot_copy);
 }
 
@@ -131,7 +131,7 @@ Volume::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsy
   g_volume_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     Glib::unwrap(mount_operation),
     nullptr, // cancellable
-    &SignalProxy_async_callback, slot_copy);
+    &giomm_SignalProxy_async_callback, slot_copy);
 }
 
 void
diff --git a/glib/glibmm/utility.h b/glib/glibmm/utility.h
index 4179e6ce..bbc19d62 100644
--- a/glib/glibmm/utility.h
+++ b/glib/glibmm/utility.h
@@ -87,6 +87,10 @@ void append_canonical_typename(std::string& dest, const char* type_name);
 // Instantiations can be used as destroy callbacks in glib functions
 // that take a GDestroyNotify parameter, such as g_object_set_qdata_full()
 // and g_option_group_set_translate_func().
+//
+// Callbacks from C functions shall have C linkage.
+// A template cannot have C linkage. Thus, this template function is not
+// as useful as was once thought.
 template <typename T>
 void
 destroy_notify_delete(void* data)