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.ccg b/gio/src/dbusconnection.ccg
index ff1ba33f..55103fe1 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -333,7 +333,7 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
   init_async(slot);
 }
 
-DBusConnection::DBusConnection(const Glib::ustring& address,
+DBusConnection::DBusConnection(const std::string& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   const Glib::RefPtr<Cancellable>& cancellable,
@@ -346,7 +346,7 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
   init_async(slot, cancellable);
 }
 
-DBusConnection::DBusConnection(const Glib::ustring& address,
+DBusConnection::DBusConnection(const std::string& address,
   const SlotAsyncReady& slot,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
@@ -358,7 +358,7 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
   init_async(slot, cancellable);
 }
 
-DBusConnection::DBusConnection(const Glib::ustring& address,
+DBusConnection::DBusConnection(const std::string& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
@@ -370,7 +370,7 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
   init_async(slot);
 }
 
-DBusConnection::DBusConnection(const Glib::ustring& address,
+DBusConnection::DBusConnection(const std::string& address,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
 :
@@ -433,7 +433,7 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
   init();
 }
 
-DBusConnection::DBusConnection(const Glib::ustring& address,
+DBusConnection::DBusConnection(const std::string& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
@@ -445,7 +445,7 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
   init(cancellable);
 }
 
-DBusConnection::DBusConnection(const Glib::ustring& address,
+DBusConnection::DBusConnection(const std::string& address,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
 :
@@ -456,7 +456,7 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
   init(cancellable);
 }
 
-DBusConnection::DBusConnection(const Glib::ustring& address,
+DBusConnection::DBusConnection(const std::string& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   DBusConnectionFlags flags)
 :
@@ -467,7 +467,7 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
   init();
 }
 
-DBusConnection::DBusConnection(const Glib::ustring& address,
+DBusConnection::DBusConnection(const std::string& address,
   DBusConnectionFlags flags)
 :
   _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
@@ -572,7 +572,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
 }
 
 //static
-void DBusConnection::create_for_address(const Glib::ustring& address,
+void DBusConnection::create_for_address(const std::string& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   const Glib::RefPtr<Cancellable>& cancellable,
@@ -584,7 +584,7 @@ void DBusConnection::create_for_address(const Glib::ustring& address,
 }
 
 //static
-void DBusConnection::create_for_address(const Glib::ustring& address,
+void DBusConnection::create_for_address(const std::string& address,
   const SlotAsyncReady& slot,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
@@ -595,7 +595,7 @@ void DBusConnection::create_for_address(const Glib::ustring& address,
 }
 
 //static
-void DBusConnection::create_for_address(const Glib::ustring& address,
+void DBusConnection::create_for_address(const std::string& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
@@ -606,7 +606,7 @@ void DBusConnection::create_for_address(const Glib::ustring& address,
 }
 
 //static
-void DBusConnection::create_for_address(const Glib::ustring& address,
+void DBusConnection::create_for_address(const std::string& address,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
 {
@@ -617,7 +617,7 @@ void DBusConnection::create_for_address(const Glib::ustring& address,
 
 //static
 Glib::RefPtr<DBusConnection> 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)
@@ -628,7 +628,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
 
 //static
 Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
-  const Glib::ustring& address,
+  const std::string& address,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
 {
@@ -638,7 +638,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
 
 //static
 Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
-  const Glib::ustring& address,
+  const std::string& address,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   DBusConnectionFlags flags)
 {
@@ -648,7 +648,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
 
 //static
 Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
-  const Glib::ustring& address,
+  const std::string& address,
   DBusConnectionFlags flags)
 {
   return Glib::RefPtr<DBusConnection>(new DBusConnection(address, flags));