DBus: Use std::string for guid's.

	* gio/src/dbusaddress.{ccg,hg}:
	* gio/src/dbusconnection.{ccg,hg}:
	* gio/src/dbusserver.{ccg,hg}:
	* gio/src/dbusutils.{ccg,hg}: Use std::string instead of Glib::ustring
	for guid's since std::string's API is probably adequate enough for
	their use.

1 files changed, 16 insertions, 16 deletions

diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index c467501e..ff1ba33f 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -278,7 +278,7 @@ namespace Gio
 {
 
 DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   const Glib::RefPtr<Cancellable>& cancellable,
@@ -293,7 +293,7 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
 }
 
 DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const SlotAsyncReady& slot,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
@@ -307,7 +307,7 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
 }
 
 DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
@@ -321,7 +321,7 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
 }
 
 DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
 :
@@ -382,7 +382,7 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
 }
 
 DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
@@ -396,7 +396,7 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
 }
 
 DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
 :
@@ -409,7 +409,7 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
 }
 
 DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   DBusConnectionFlags flags)
 :
@@ -422,7 +422,7 @@ DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
 }
 
 DBusConnection::DBusConnection(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   DBusConnectionFlags flags)
 :
   _CONSTRUCT("stream", Glib::unwrap(stream),
@@ -479,7 +479,7 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
 
 //static
 void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   const Glib::RefPtr<Cancellable>& cancellable,
@@ -493,7 +493,7 @@ void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
 
 //static
 void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const SlotAsyncReady& slot,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
@@ -506,7 +506,7 @@ void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
 
 //static
 void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
@@ -518,7 +518,7 @@ void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
 
 //static
 void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const SlotAsyncReady& slot,
   DBusConnectionFlags flags)
 {
@@ -530,7 +530,7 @@ void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
 //static
 Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
   const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
@@ -542,7 +542,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
 //static
 Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
   const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusConnectionFlags flags)
 {
@@ -553,7 +553,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
 //static
 Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
   const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   DBusConnectionFlags flags)
 {
@@ -564,7 +564,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
 //static
 Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
   const Glib::RefPtr<IOStream>& stream,
-  const Glib::ustring& guid,
+  const std::string& guid,
   DBusConnectionFlags flags)
 {
   return Glib::RefPtr<DBusConnection>(new DBusConnection(stream, guid,