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.

9 files changed, 73 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index 7b182833..6f288ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-11  José Alburquerque  <jaalburqu@svn.gnome.org>
+
+	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.
+
 2011-01-10  José Alburquerque  <jaalburqu@svn.gnome.org>
 
 	DBus: Add a peer example to test the DBusServer class.
diff --git a/gio/src/dbusaddress.ccg b/gio/src/dbusaddress.ccg
index 46ebb639..703a151b 100644
--- a/gio/src/dbusaddress.ccg
+++ b/gio/src/dbusaddress.ccg
@@ -59,7 +59,7 @@ void get_stream(const Glib::ustring& address, const SlotAsyncReady slot)
 }
 
 Glib::RefPtr<IOStream> get_stream_finish(const Glib::RefPtr<AsyncResult>& res,
-  Glib::ustring& out_guid)
+  std::string& out_guid)
 {
   GError* gerror = 0;
   gchar* g_out_guid = 0;
@@ -90,7 +90,7 @@ Glib::RefPtr<IOStream> get_stream_finish(const Glib::RefPtr<AsyncResult>& res)
 }
 
 Glib::RefPtr<IOStream> get_stream_sync(const Glib::ustring& address,
-  const Glib::RefPtr<Cancellable>& cancellable, Glib::ustring& out_guid)
+  const Glib::RefPtr<Cancellable>& cancellable, std::string& out_guid)
 {
   GError* gerror = 0;
   gchar* g_out_guid = 0;
@@ -107,7 +107,7 @@ Glib::RefPtr<IOStream> get_stream_sync(const Glib::ustring& address,
 }
 
 Glib::RefPtr<IOStream> get_stream_sync(const Glib::ustring& address,
-  Glib::ustring& out_guid)
+  std::string& out_guid)
 {
   GError* gerror = 0;
   gchar* g_out_guid = 0;
diff --git a/gio/src/dbusaddress.hg b/gio/src/dbusaddress.hg
index d91e53e8..f89b8621 100644
--- a/gio/src/dbusaddress.hg
+++ b/gio/src/dbusaddress.hg
@@ -89,7 +89,7 @@ void get_stream(const Glib::ustring& address, const SlotAsyncReady slot);
  * @ingroup DBus
  */
 Glib::RefPtr<IOStream> get_stream_finish(const Glib::RefPtr<AsyncResult>& res,
-  Glib::ustring& out_guid);
+  std::string& out_guid);
 
 /** Finishes an operation started with get_stream().
  *
@@ -119,11 +119,11 @@ Glib::RefPtr<IOStream> get_stream_finish(const Glib::RefPtr<AsyncResult>& res);
  * @ingroup DBus
  */
 Glib::RefPtr<IOStream> get_stream_sync(const Glib::ustring& address,
-  const Glib::RefPtr<Cancellable>& cancellable, Glib::ustring& out_guid);
+  const Glib::RefPtr<Cancellable>& cancellable, std::string& out_guid);
 
 /// A non-cancellable version of get_stream_sync().
 Glib::RefPtr<IOStream> get_stream_sync(const Glib::ustring& address,
-  Glib::ustring& out_guid);
+  std::string& out_guid);
 
 /** Synchronously connects to an endpoint specified by @a address and sets up
  * the connection so it is in a state to run the client-side of the D-Bus
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,
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index 0b8a3ba4..8142a2ee 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -73,47 +73,47 @@ protected:
 protected:
 
   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,
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::RefPtr<IOStream>& stream,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const SlotAsyncReady& slot,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::RefPtr<IOStream>& stream,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const SlotAsyncReady& slot,
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::RefPtr<IOStream>& stream,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const SlotAsyncReady& slot,
     DBusConnectionFlags flags);
 
   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);
 
   DBusConnection(const Glib::RefPtr<IOStream>& stream,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::RefPtr<IOStream>& stream,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::RefPtr<IOStream>& stream,
-    const Glib::ustring& guid,
+    const std::string& guid,
     DBusConnectionFlags flags);
 
   DBusConnection(const Glib::ustring& address,
@@ -218,7 +218,7 @@ public:
 
   _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new)
   static void 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,
@@ -226,21 +226,21 @@ public:
 
   _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new)
   static void create(const Glib::RefPtr<IOStream>& stream,
-    const Glib::ustring& guid,
+    const std::string& 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,
+    const std::string& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     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 std::string& guid,
     const SlotAsyncReady& slot,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
@@ -280,7 +280,7 @@ public:
   /// @throw Glib::Error.
   static Glib::RefPtr<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 = Gio::DBUS_CONNECTION_FLAGS_NONE);
@@ -289,21 +289,21 @@ public:
   /// @throw Glib::Error.
   static Glib::RefPtr<DBusConnection> create_sync(
     const Glib::RefPtr<IOStream>& stream,
-    const Glib::ustring& guid,
+    const std::string& 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 std::string& 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,
+    const std::string& guid,
     DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
 
   _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address_sync)
@@ -598,7 +598,7 @@ public:
   _WRAP_METHOD(Glib::RefPtr<IOStream> get_stream(), g_dbus_connection_get_stream, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const IOStream> get_stream() const, g_dbus_connection_get_stream, refreturn, constversion)
 
-  _WRAP_METHOD(Glib::ustring get_guid() const, g_dbus_connection_get_guid)
+  _WRAP_METHOD(std::string get_guid() const, g_dbus_connection_get_guid)
   _WRAP_METHOD(Glib::ustring get_unique_name() const, g_dbus_connection_get_unique_name)
 
   _WRAP_METHOD(DBusCapabilityFlags get_capabilities() const, g_dbus_connection_get_capabilities)
diff --git a/gio/src/dbusserver.ccg b/gio/src/dbusserver.ccg
index 985811af..e88a6b9f 100644
--- a/gio/src/dbusserver.ccg
+++ b/gio/src/dbusserver.ccg
@@ -25,7 +25,7 @@ namespace Gio
 {
 
 DBusServer::DBusServer(const Glib::ustring& address,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusServerFlags flags)
@@ -39,7 +39,7 @@ DBusServer::DBusServer(const Glib::ustring& address,
 }
 
 DBusServer::DBusServer(const Glib::ustring& address,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusServerFlags flags)
   : _CONSTRUCT("address",
@@ -52,7 +52,7 @@ DBusServer::DBusServer(const Glib::ustring& address,
 }
 
 DBusServer::DBusServer(const Glib::ustring& address,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   DBusServerFlags flags)
   : _CONSTRUCT("address",
@@ -65,7 +65,7 @@ DBusServer::DBusServer(const Glib::ustring& address,
 }
 
 DBusServer::DBusServer(const Glib::ustring& address,
-  const Glib::ustring& guid,
+  const std::string& guid,
   DBusServerFlags flags)
   : _CONSTRUCT("address",
     (address.empty() ? static_cast<char*>(0) : address.c_str()),
@@ -77,7 +77,7 @@ DBusServer::DBusServer(const Glib::ustring& address,
 }
 
 Glib::RefPtr<DBusServer> DBusServer::create_sync(const Glib::ustring& address,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusServerFlags flags)
@@ -104,7 +104,7 @@ Glib::RefPtr<DBusServer> DBusServer::create_sync(const Glib::ustring& address,
 }
 
 Glib::RefPtr<DBusServer> DBusServer::create_sync(const Glib::ustring& address,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<Cancellable>& cancellable,
   DBusServerFlags flags)
 {
@@ -129,7 +129,7 @@ Glib::RefPtr<DBusServer> DBusServer::create_sync(const Glib::ustring& address,
 }
 
 Glib::RefPtr<DBusServer> DBusServer::create_sync(const Glib::ustring& address,
-  const Glib::ustring& guid,
+  const std::string& guid,
   const Glib::RefPtr<DBusAuthObserver>& observer,
   DBusServerFlags flags)
 {
@@ -155,7 +155,7 @@ Glib::RefPtr<DBusServer> DBusServer::create_sync(const Glib::ustring& address,
 }
 
 Glib::RefPtr<DBusServer> DBusServer::create_sync(const Glib::ustring& address,
-  const Glib::ustring& guid,
+  const std::string& guid,
   DBusServerFlags flags)
 {
   //TODO: Use the constructor instead of the code underneath when
diff --git a/gio/src/dbusserver.hg b/gio/src/dbusserver.hg
index 321b7973..32ea99b9 100644
--- a/gio/src/dbusserver.hg
+++ b/gio/src/dbusserver.hg
@@ -48,23 +48,23 @@ class DBusServer : public Glib::Object, public Initable
 protected:
 
   DBusServer(const Glib::ustring& address,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusServerFlags flags);
 
   DBusServer(const Glib::ustring& address,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusServerFlags flags);
 
   DBusServer(const Glib::ustring& address,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     DBusServerFlags flags);
 
   DBusServer(const Glib::ustring& address,
-    const Glib::ustring& guid,
+    const std::string& guid,
     DBusServerFlags flags);
 
 public:
@@ -72,7 +72,7 @@ public:
   _WRAP_METHOD_DOCS_ONLY(g_dbus_server_new_sync)
   /// @throw Glib::Error.
   static Glib::RefPtr<DBusServer> create_sync(const Glib::ustring& address,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusServerFlags flags = Gio::DBUS_SERVER_FLAGS_NONE);
@@ -80,25 +80,25 @@ public:
   _WRAP_METHOD_DOCS_ONLY(g_dbus_server_new_sync)
   /// @throw Glib::Error.
   static Glib::RefPtr<DBusServer> create_sync(const Glib::ustring& address,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const Glib::RefPtr<Cancellable>& cancellable,
     DBusServerFlags flags = Gio::DBUS_SERVER_FLAGS_NONE);
 
   /// Non-cancellable version of create_sync().
   static Glib::RefPtr<DBusServer> create_sync(const Glib::ustring& address,
-    const Glib::ustring& guid,
+    const std::string& guid,
     const Glib::RefPtr<DBusAuthObserver>& observer,
     DBusServerFlags flags = Gio::DBUS_SERVER_FLAGS_NONE);
 
   /// Non-cancellable version of create_sync().
   static Glib::RefPtr<DBusServer> create_sync(const Glib::ustring& address,
-    const Glib::ustring& guid,
+    const std::string& guid,
     DBusServerFlags flags = Gio::DBUS_SERVER_FLAGS_NONE);
 
   _WRAP_METHOD(void start(), g_dbus_server_start)
   _WRAP_METHOD(void stop(), g_dbus_server_stop)
   _WRAP_METHOD(bool is_active() const, g_dbus_server_is_active)
-  _WRAP_METHOD(Glib::ustring get_guid() const, g_dbus_server_get_guid)
+  _WRAP_METHOD(std::string get_guid() const, g_dbus_server_get_guid)
   _WRAP_METHOD(DBusServerFlags get_flags() const, g_dbus_server_get_flags)
   _WRAP_METHOD(Glib::ustring get_client_address() const, g_dbus_server_get_client_address)
 
@@ -107,7 +107,7 @@ public:
   _WRAP_PROPERTY("authentication-observer", Glib::RefPtr<DBusAuthObserver>)
   _WRAP_PROPERTY("client-address", Glib::ustring)
   _WRAP_PROPERTY("flags", DBusServerFlags)
-  _WRAP_PROPERTY("guid", Glib::ustring)
+  _WRAP_PROPERTY("guid", std::string)
 
 #m4 _CONVERSION(`GDBusConnection*', `const Glib::RefPtr<DBusConnection>&', `Glib::wrap($3, true)')
   _WRAP_SIGNAL(bool new_connection(const Glib::RefPtr<DBusConnection>& connection), "new-connection", no_default_handler)
diff --git a/gio/src/dbusutils.ccg b/gio/src/dbusutils.ccg
index a143243b..2d1d48e1 100644
--- a/gio/src/dbusutils.ccg
+++ b/gio/src/dbusutils.ccg
@@ -25,12 +25,12 @@ namespace Gio
 namespace DBus
 {
 
-Glib::ustring generate_guid()
+std::string generate_guid()
 {
-  return Glib::ustring(g_dbus_generate_guid());
+  return std::string(g_dbus_generate_guid());
 }
 
-bool is_guid(const Glib::ustring& string)
+bool is_guid(const std::string& string)
 {
   return static_cast<bool>(g_dbus_is_guid(string.c_str()));
 }
diff --git a/gio/src/dbusutils.hg b/gio/src/dbusutils.hg
index 11185fe6..885f9e0b 100644
--- a/gio/src/dbusutils.hg
+++ b/gio/src/dbusutils.hg
@@ -35,7 +35,7 @@ namespace DBus
  * @newin{2,28}
  * @ingroup DBus
  */
-Glib::ustring generate_guid();
+std::string generate_guid();
 
 /** Checks if @a string is a D-Bus GUID.
  *
@@ -47,7 +47,7 @@ Glib::ustring generate_guid();
  * @newin{2,28}
  * @ingroup DBus
  */
-bool is_guid(const Glib::ustring& string);
+bool is_guid(const std::string& string);
 
 /** Checks if @a string is a valid D-Bus bus name (either unique or
  * well-known).