DBus: Use std::string for addresses since they could be a file path.

	* gio/src/dbusaddress.{ccg,hg}:
	* gio/src/dbusconnection.{ccg,hg}:
	* gio/src/dbusserver.{ccg,hg}: Use std::string instead of
	Glib::ustring for address parameters just to avoid possible errors
	since DBus address could be a filename path as the "Addresses"
	section of the DBus introduction seems to imply:
	http://www.freedesktop.org/wiki/IntroductionToDBus.

1 files changed, 16 insertions, 16 deletions

diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index 8142a2ee..709d1a40 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -116,40 +116,40 @@ protected:
     const std::string& guid,
     DBusConnectionFlags flags);
 
-  DBusConnection(const Glib::ustring& address,
+  DBusConnection(const std::string& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const SlotAsyncReady& slot,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags);
 
-  DBusConnection(const Glib::ustring& address,
+  DBusConnection(const std::string& address,
     const SlotAsyncReady& slot,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags);
 
-  DBusConnection(const Glib::ustring& address,
+  DBusConnection(const std::string& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const SlotAsyncReady& slot,
     DBusConnectionFlags flags);
 
-  DBusConnection(const Glib::ustring& address,
+  DBusConnection(const std::string& address,
     const SlotAsyncReady& slot,
     DBusConnectionFlags flags);
 
-  DBusConnection(const Glib::ustring& address,
+  DBusConnection(const std::string& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags);
 
-  DBusConnection(const Glib::ustring& address,
+  DBusConnection(const std::string& address,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags);
 
-  DBusConnection(const Glib::ustring& address,
+  DBusConnection(const std::string& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     DBusConnectionFlags flags);
 
-  DBusConnection(const Glib::ustring& address,
+  DBusConnection(const std::string& address,
     DBusConnectionFlags flags);
 
 public:
@@ -249,26 +249,26 @@ public:
   _WRAP_METHOD(static Glib::RefPtr<DBusConnection> create_finish(const Glib::RefPtr<AsyncResult>& res), g_dbus_connection_new_finish, errthrow)
 
   _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address)
-  static void create_for_address(const Glib::ustring& address,
+  static void create_for_address(const std::string& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const SlotAsyncReady& slot,
     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,
+  static void create_for_address(const std::string& 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,
+  static void create_for_address(const std::string& 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,
+  static void create_for_address(const std::string& address,
     const SlotAsyncReady& slot,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
@@ -309,7 +309,7 @@ public:
   _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 std::string& address,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
@@ -317,19 +317,19 @@ public:
   _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 std::string& 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 std::string& 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,
+    const std::string& address,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
   /** Closes the connection. Note that this never causes the process to exit