[glibmm] DBusConnection: Add non-observable create method overloads.

[José Alburquerque <jaalburqu src gnome org>]

commit d0b3a483d50508968eb65bf0799434ed796cbee3
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Wed Dec 8 19:58:55 2010 -0500

    	DBusConnection: Add non-observable create method overloads.
    
    	* gio/src/dbusconnection.{ccg,hg}: Add constructors and create methods
    	that don't require a DBusAuthObservable paramter.

 ChangeLog                  |    7 ++
 gio/src/dbusconnection.ccg |  220 ++++++++++++++++++++++++++++++++++++++++++-
 gio/src/dbusconnection.hg  |   92 ++++++++++++++++++-
 3 files changed, 309 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 37494c3..271f616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-08  José Alburquerque  <jaalburqu svn gnome org>
 
+	DBusConnection: Add non-observable create method overloads.
+
+	* gio/src/dbusconnection.{ccg,hg}: Add constructors and create methods
+	that don't require a DBusAuthObservable paramter.
+
+2010-12-08  José Alburquerque  <jaalburqu svn gnome org>
+
 	DBusConnection: Also correct the static status of the get() methods.
 
 	* gio/src/dbusconnection.{ccg,hg}: As with the create*() methods, the
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index 18495e4..f224e2b 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -27,7 +27,10 @@ namespace
 extern "C"
 {
 
-static void DBusConnection_Signal_giomm_callback(GDBusConnection* connection, const gchar* sender_name, const gchar* object_path, const gchar* interface_name, const gchar* signal_name, GVariant* parameters, gpointer user_data)
+static void DBusConnection_Signal_giomm_callback(GDBusConnection* connection,
+  const gchar* sender_name, const gchar* object_path,
+  const gchar* interface_name, const gchar* signal_name, GVariant* parameters,
+  gpointer user_data)
 {
   Gio::DBusConnection::SlotSignal* the_slot =
     static_cast<Gio::DBusConnection::SlotSignal*>(user_data);
@@ -49,7 +52,9 @@ static void DBusConnection_Signal_giomm_callback_destroy(void* data)
   delete static_cast<Gio::DBusConnection::SlotSignal*>(data);
 }
 
-static GDBusMessage* DBusConnection_Message_Filter_giomm_callback(GDBusConnection* connection, GDBusMessage* message, gboolean incoming, gpointer user_data)
+static GDBusMessage* DBusConnection_Message_Filter_giomm_callback(
+  GDBusConnection* connection, GDBusMessage* message, gboolean incoming,
+  gpointer user_data)
 {
   Gio::DBusConnection::SlotMessageFilter* the_slot =
     static_cast<Gio::DBusConnection::SlotMessageFilter*>(user_data);
@@ -98,6 +103,20 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
 
 DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
   const Glib::ustring& guid,
+  const SlotAsyncReady& slot,
+  const Glib::RefPtr<Cancellable>& cancellable,
+  DBusConnectionFlags flags)
+:
+  _CONSTRUCT("stream", Glib::unwrap(stream),
+    "guid", (guid.empty() ? 0 : guid.c_str()),
+    "flags", static_cast<GDBusConnectionFlags>(flags),
+    "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+{
+  init_async(slot, cancellable);
+}
+
+DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
+  const Glib::ustring& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
@@ -110,6 +129,19 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
   init_async(slot);
 }
 
+DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
+  const Glib::ustring& guid,
+  const SlotAsyncReady& slot,
+  DBusConnectionFlags flags)
+:
+  _CONSTRUCT("stream", Glib::unwrap(stream),
+    "guid", (guid.empty() ? 0 : guid.c_str()),
+    "flags", static_cast<GDBusConnectionFlags>(flags),
+    "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+{
+  init_async(slot);
+}
+
 DBusConnection::DBusConnection(const Glib::ustring& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
@@ -118,7 +150,19 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
 :
   _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
     "flags", static_cast<GDBusConnectionFlags>(flags),
-    "observer", Glib::unwrap(observer))
+    "authentication-observer", Glib::unwrap(observer))
+{
+  init_async(slot, cancellable);
+}
+
+DBusConnection::DBusConnection(const Glib::ustring& address,
+  const SlotAsyncReady& slot,
+  const Glib::RefPtr<Cancellable>& cancellable,
+  DBusConnectionFlags flags)
+:
+  _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+    "flags", static_cast<GDBusConnectionFlags>(flags),
+    "authentication-observer", static_cast<GDBusAuthObserver*>(0))
 {
   init_async(slot, cancellable);
 }
@@ -130,7 +174,18 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
 :
   _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
     "flags", static_cast<GDBusConnectionFlags>(flags),
-    "observer", Glib::unwrap(observer))
+    "authentication-observer", Glib::unwrap(observer))
+{
+  init_async(slot);
+}
+
+DBusConnection::DBusConnection(const Glib::ustring& address,
+  const SlotAsyncReady& slot,
+  DBusConnectionFlags flags)
+:
+  _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+    "flags", static_cast<GDBusConnectionFlags>(flags),
+    "authentication-observer", static_cast<GDBusAuthObserver*>(0))
 {
   init_async(slot);
 }
@@ -151,6 +206,19 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
 
 DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
   const Glib::ustring& guid,
+  const Glib::RefPtr<Cancellable>& cancellable,
+  DBusConnectionFlags flags)
+:
+  _CONSTRUCT("stream", Glib::unwrap(stream),
+    "guid", (guid.empty() ? 0 : guid.c_str()),
+    "flags", static_cast<GDBusConnectionFlags>(flags),
+    "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+{
+  init(cancellable);
+}
+
+DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
+  const Glib::ustring& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   DBusConnectionFlags flags)
 :
@@ -162,6 +230,18 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
   init();
 }
 
+DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
+  const Glib::ustring& guid,
+  DBusConnectionFlags flags)
+:
+  _CONSTRUCT("stream", Glib::unwrap(stream),
+    "guid", (guid.empty() ? 0 : guid.c_str()),
+    "flags", static_cast<GDBusConnectionFlags>(flags),
+    "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+{
+  init();
+}
+
 DBusConnection::DBusConnection(const Glib::ustring& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const Glib::RefPtr<Cancellable>& cancellable,
@@ -169,7 +249,18 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
 :
   _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
     "flags", static_cast<GDBusConnectionFlags>(flags),
-    "observer", Glib::unwrap(observer))
+    "authentication-observer", Glib::unwrap(observer))
+{
+  init(cancellable);
+}
+
+DBusConnection::DBusConnection(const Glib::ustring& address,
+  const Glib::RefPtr<Cancellable>& cancellable,
+  DBusConnectionFlags flags)
+:
+  _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+    "flags", static_cast<GDBusConnectionFlags>(flags),
+    "authentication-observer", static_cast<GDBusAuthObserver*>(0))
 {
   init(cancellable);
 }
@@ -180,7 +271,17 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
 :
   _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
     "flags", static_cast<GDBusConnectionFlags>(flags),
-    "observer", Glib::unwrap(observer))
+    "authentication-observer", Glib::unwrap(observer))
+{
+  init();
+}
+
+DBusConnection::DBusConnection(const Glib::ustring& address,
+  DBusConnectionFlags flags)
+:
+  _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+    "flags", static_cast<GDBusConnectionFlags>(flags),
+    "authentication-observer", static_cast<GDBusAuthObserver*>(0))
 {
   init();
 }
@@ -207,6 +308,24 @@ void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
 //static
 void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
   const Glib::ustring& guid,
+  const SlotAsyncReady& slot,
+  const Glib::RefPtr<Cancellable>& cancellable,
+  DBusConnectionFlags flags)
+{
+  // Note that this does not return anything, because it is async - see
+  // create_finish().
+
+  // Create the connection, taking an extra reference without returning it.
+  // The extra reference is taken so the connection is not destroyed when it
+  // goes out of scope.  The finished connection will be returned in the slot
+  // by calling create_finish().
+  Glib::RefPtr<DBusConnection>(new DBusConnection(stream, guid, slot,
+    cancellable, flags))->reference();
+}
+
+//static
+void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
+  const Glib::ustring& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
@@ -223,6 +342,23 @@ void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
 }
 
 //static
+void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
+  const Glib::ustring& guid,
+  const SlotAsyncReady& slot,
+  DBusConnectionFlags flags)
+{
+  // Note that this does not return anything, because it is async - see
+  // create_finish().
+
+  // Create the connection, taking an extra reference without returning it.
+  // The extra reference is taken so the connection is not destroyed when it
+  // goes out of scope.  The finished connection will be returned in the slot
+  // by calling create_finish().
+  Glib::RefPtr<DBusConnection>(new DBusConnection(stream, guid, slot,
+    flags))->reference();
+}
+
+//static
 Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
   const Glib::RefPtr<IOStream>& stream,
   const Glib::ustring& guid,
@@ -238,6 +374,17 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
 Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
   const Glib::RefPtr<IOStream>& stream,
   const Glib::ustring& guid,
+  const Glib::RefPtr<Cancellable>& cancellable,
+  DBusConnectionFlags flags)
+{
+  return Glib::RefPtr<DBusConnection>(new DBusConnection(stream, guid,
+    cancellable, flags));
+}
+
+//static
+Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
+  const Glib::RefPtr<IOStream>& stream,
+  const Glib::ustring& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   DBusConnectionFlags flags)
 {
@@ -246,6 +393,16 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
 }
 
 //static
+Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
+  const Glib::RefPtr<IOStream>& stream,
+  const Glib::ustring& guid,
+  DBusConnectionFlags flags)
+{
+  return Glib::RefPtr<DBusConnection>(new DBusConnection(stream, guid,
+    flags));
+}
+
+//static
 void DBusConnection::create_for_address(const Glib::ustring& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
@@ -265,6 +422,23 @@ void DBusConnection::create_for_address(const Glib::ustring& address,
 
 //static
 void DBusConnection::create_for_address(const Glib::ustring& address,
+  const SlotAsyncReady& slot,
+  const Glib::RefPtr<Cancellable>& cancellable,
+  DBusConnectionFlags flags)
+{
+  // Note that this does not return anything, because it is async - see
+  // create_finish().
+
+  // Create the connection, taking an extra reference without returning it.
+  // The extra reference is taken so the connection is not destroyed when it
+  // goes out of scope.  The finished connection will be returned in the slot
+  // by calling create_finish().
+  Glib::RefPtr<DBusConnection>(new DBusConnection(address, slot, cancellable,
+    flags))->reference();
+}
+
+//static
+void DBusConnection::create_for_address(const Glib::ustring& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
@@ -281,6 +455,22 @@ void DBusConnection::create_for_address(const Glib::ustring& address,
 }
 
 //static
+void DBusConnection::create_for_address(const Glib::ustring& address,
+  const SlotAsyncReady& slot,
+  DBusConnectionFlags flags)
+{
+  // Note that this does not return anything, because it is async - see
+  // create_finish().
+
+  // Create the connection, taking an extra reference without returning it.
+  // The extra reference is taken so the connection is not destroyed when it
+  // goes out of scope.  The finished connection will be returned in the slot
+  // by calling create_finish().
+  Glib::RefPtr<DBusConnection>(new DBusConnection(address, slot,
+    flags))->reference();
+}
+
+//static
 Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
   const Glib::ustring& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
@@ -294,6 +484,16 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
 //static
 Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
   const Glib::ustring& address,
+  const Glib::RefPtr<Cancellable>& cancellable,
+  DBusConnectionFlags flags)
+{
+  return Glib::RefPtr<DBusConnection>(new DBusConnection(address, cancellable,
+    flags));
+}
+
+//static
+Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
+  const Glib::ustring& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   DBusConnectionFlags flags)
 {
@@ -302,6 +502,14 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
 }
 
 //static
+Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
+  const Glib::ustring& address,
+  DBusConnectionFlags flags)
+{
+  return Glib::RefPtr<DBusConnection>(new DBusConnection(address, flags));
+}
+
+//static
 void DBusConnection::get(BusType bus_type, const SlotAsyncReady& slot,
   const Glib::RefPtr<Cancellable>& cancellable)
 {
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index e9ab2f8..6d9752f 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -72,21 +72,41 @@ protected:
 
   DBusConnection(const Glib::RefPtr<IOStream>& stream,
     const Glib::ustring& guid,
+    const SlotAsyncReady& slot,
+    const Glib::RefPtr<Cancellable>& cancellable,
+    DBusConnectionFlags flags);
+
+  DBusConnection(const Glib::RefPtr<IOStream>& stream,
+    const Glib::ustring& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const SlotAsyncReady& slot,
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::RefPtr<IOStream>& stream,
     const Glib::ustring& guid,
+    const SlotAsyncReady& slot,
+    DBusConnectionFlags flags);
+
+  DBusConnection(const Glib::RefPtr<IOStream>& stream,
+    const Glib::ustring& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::RefPtr<IOStream>& stream,
     const Glib::ustring& guid,
+    const Glib::RefPtr<Cancellable>& cancellable,
+    DBusConnectionFlags flags);
+
+  DBusConnection(const Glib::RefPtr<IOStream>& stream,
+    const Glib::ustring& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     DBusConnectionFlags flags);
 
+  DBusConnection(const Glib::RefPtr<IOStream>& stream,
+    const Glib::ustring& guid,
+    DBusConnectionFlags flags);
+
   DBusConnection(const Glib::ustring& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const SlotAsyncReady& slot,
@@ -94,19 +114,35 @@ protected:
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::ustring& address,
+    const SlotAsyncReady& slot,
+    const Glib::RefPtr<Cancellable>& cancellable,
+    DBusConnectionFlags flags);
+
+  DBusConnection(const Glib::ustring& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const SlotAsyncReady& slot,
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::ustring& address,
+    const SlotAsyncReady& slot,
+    DBusConnectionFlags flags);
+
+  DBusConnection(const Glib::ustring& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::ustring& address,
+    const Glib::RefPtr<Cancellable>& cancellable,
+    DBusConnectionFlags flags);
+
+  DBusConnection(const Glib::ustring& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     DBusConnectionFlags flags);
 
+  DBusConnection(const Glib::ustring& address,
+    DBusConnectionFlags flags);
+
 public:
 
   /** Signature for slot used in signal_subscribe().
@@ -179,6 +215,13 @@ public:
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
+  _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new)
+  static void create(const Glib::RefPtr<IOStream>& stream,
+    const Glib::ustring& guid,
+    const SlotAsyncReady& slot,
+    const Glib::RefPtr<Cancellable>& cancellable,
+    DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
+
   /// Non-cancellable version of create().
   static void create(const Glib::RefPtr<IOStream>& stream,
     const Glib::ustring& guid,
@@ -186,6 +229,12 @@ public:
     const SlotAsyncReady& slot,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
+  /// Non-cancellable version of create().
+  static void create(const Glib::RefPtr<IOStream>& stream,
+    const Glib::ustring& guid,
+    const SlotAsyncReady& slot,
+    DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
+
   _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_finish)
   /// @throw Glib::Error.
   _WRAP_METHOD(static Glib::RefPtr<DBusConnection> create_finish(const Glib::RefPtr<AsyncResult>& res), g_dbus_connection_new_finish, errthrow)
@@ -197,12 +246,23 @@ public:
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
+  _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address)
+  static void create_for_address(const Glib::ustring& address,
+    const SlotAsyncReady& slot,
+    const Glib::RefPtr<Cancellable>& cancellable,
+    DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
+
   /// Non-cancellable version of create_for_address().
   static void create_for_address(const Glib::ustring& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const SlotAsyncReady& slot,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
+  /// Non-cancellable version of create_for_address().
+  static void create_for_address(const Glib::ustring& address,
+    const SlotAsyncReady& slot,
+    DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
+
   _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address_finish)
   /// @throw Glib::Error.
   _WRAP_METHOD(static Glib::RefPtr<DBusConnection> create_for_address_finish(const Glib::RefPtr<AsyncResult>& res), g_dbus_connection_new_for_address_finish, errthrow)
@@ -216,14 +276,27 @@ public:
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
-  /** Non-cancellable version of create_sync().
-   */
+  _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_sync)
+  /// @throw Glib::Error.
+  static Glib::RefPtr<DBusConnection> create_sync(
+    const Glib::RefPtr<IOStream>& stream,
+    const Glib::ustring& guid,
+    const Glib::RefPtr<Cancellable>& cancellable,
+    DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
+
+  /// Non-cancellable version of create_sync().
   static Glib::RefPtr<DBusConnection> create_sync(
     const Glib::RefPtr<IOStream>& stream,
     const Glib::ustring& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
+  /// Non-cancellable version of create_sync().
+  static Glib::RefPtr<DBusConnection> create_sync(
+    const Glib::RefPtr<IOStream>& stream,
+    const Glib::ustring& guid,
+    DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
+
   _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address_sync)
   /// @throw Glib::Error.
   static Glib::RefPtr<DBusConnection> create_for_address_sync(
@@ -232,13 +305,24 @@ public:
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
-  /** Non-cancellable version of create_for_address_sync().
-   */
+  _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address_sync)
+  /// @throw Glib::Error.
+  static Glib::RefPtr<DBusConnection> create_for_address_sync(
+    const Glib::ustring& address,
+    const Glib::RefPtr<Cancellable>& cancellable,
+    DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
+
+  /// Non-cancellable version of create_for_address_sync().
   static Glib::RefPtr<DBusConnection> create_for_address_sync(
     const Glib::ustring& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
+  /// Non-cancellable version of create_for_address_sync().
+  static Glib::RefPtr<DBusConnection> create_for_address_sync(
+    const Glib::ustring& address,
+    DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
+
   /** Closes the connection. Note that this never causes the process to exit
    * (this might only happen if the other end of a shared message bus
    * connection disconnects, see property_exit_on_close()).