Use the utility functions for creating strings.

* gio/src/dbuserrorutils.ccg:
* gio/src/dbusownname.ccg:
* gio/src/dbusutils.ccg:
* gio/src/dbuswatchname.ccg:
* glib/src/fileutils.ccg:
* glib/src/iochannel.ccg:
* glib/src/markup.ccg:
* glib/src/variant.ccg: Use convert_const_gchar_ptr_to_ustring() and
convert_const_gchar_ptr_to_stdstring(), simplifying code and sometimes
avoiding crashes with NULL const char*.

4 files changed, 10 insertions, 10 deletions

diff --git a/gio/src/dbuserrorutils.ccg b/gio/src/dbuserrorutils.ccg
index dcf0c2f1..0744aaad 100644
--- a/gio/src/dbuserrorutils.ccg
+++ b/gio/src/dbuserrorutils.ccg
@@ -35,7 +35,7 @@ bool is_remote_error(const Glib::Error& error)
 
 Glib::ustring get_remote_error(const Glib::Error& error)
 {
-  return Glib::ustring(g_dbus_error_get_remote_error(error.gobj()));
+  return Glib::convert_const_gchar_ptr_to_ustring(g_dbus_error_get_remote_error(error.gobj()));
 }
 
 bool strip_remote_error(Glib::Error& error)
diff --git a/gio/src/dbusownname.ccg b/gio/src/dbusownname.ccg
index 6e5bb221..bdadb280 100644
--- a/gio/src/dbusownname.ccg
+++ b/gio/src/dbusownname.ccg
@@ -41,7 +41,7 @@ static void Bus_Acquired_giomm_callback(GDBusConnection* connection,
 
   try
   {
-    (*the_slot)(Glib::wrap(connection, true), Glib::ustring(name));
+    (*the_slot)(Glib::wrap(connection, true), Glib::convert_const_gchar_ptr_to_ustring(name));
   }
   catch(...)
   {
@@ -57,7 +57,7 @@ static void Bus_Name_Acquired_giomm_callback(GDBusConnection* connection,
 
   try
   {
-    (*the_slot)(Glib::wrap(connection, true), Glib::ustring(name));
+    (*the_slot)(Glib::wrap(connection, true), Glib::convert_const_gchar_ptr_to_ustring(name));
   }
   catch(...)
   {
@@ -73,7 +73,7 @@ static void Bus_Name_Lost_giomm_callback(GDBusConnection* connection,
 
   try
   {
-    (*the_slot)(Glib::wrap(connection, true), Glib::ustring(name));
+    (*the_slot)(Glib::wrap(connection, true), Glib::convert_const_gchar_ptr_to_ustring(name));
   }
   catch(...)
   {
diff --git a/gio/src/dbusutils.ccg b/gio/src/dbusutils.ccg
index 2d1d48e1..3967fce3 100644
--- a/gio/src/dbusutils.ccg
+++ b/gio/src/dbusutils.ccg
@@ -27,7 +27,7 @@ namespace DBus
 
 std::string generate_guid()
 {
-  return std::string(g_dbus_generate_guid());
+  return Glib::convert_const_gchar_ptr_to_stdstring(g_dbus_generate_guid());
 }
 
 bool is_guid(const std::string& string)
diff --git a/gio/src/dbuswatchname.ccg b/gio/src/dbuswatchname.ccg
index 972b6cc8..7c36e611 100644
--- a/gio/src/dbuswatchname.ccg
+++ b/gio/src/dbuswatchname.ccg
@@ -40,8 +40,8 @@ static void Bus_Name_Appeared_giomm_callback(GDBusConnection* connection,
 
   try
   {
-    (*the_slot)(Glib::wrap(connection, true), Glib::ustring(name),
-      Glib::ustring(name_owner));
+    (*the_slot)(Glib::wrap(connection, true), Glib::convert_const_gchar_ptr_to_ustring(name),
+      Glib::convert_const_gchar_ptr_to_ustring(name_owner));
   }
   catch(...)
   {
@@ -57,7 +57,7 @@ static void Bus_Name_Vanished_giomm_callback(GDBusConnection* connection,
 
   try
   {
-    (*the_slot)(Glib::wrap(connection, true), Glib::ustring(name));
+    (*the_slot)(Glib::wrap(connection, true), Glib::convert_const_gchar_ptr_to_ustring(name));
   }
   catch(...)
   {
@@ -104,7 +104,7 @@ guint watch_name(
   slots->name_vanished_slot = new SlotNameVanished(name_vanished_slot);
 
   return g_bus_watch_name(static_cast<GBusType>(bus_type), name.c_str(),
-    static_cast<GBusNameWatcherFlags>(flags), 
+    static_cast<GBusNameWatcherFlags>(flags),
     &Bus_Name_Appeared_giomm_callback, &Bus_Name_Vanished_giomm_callback,
     slots, &Bus_Watch_Name_giomm_callback_destroy);
 }
@@ -124,7 +124,7 @@ guint watch_name(
   slots->name_vanished_slot = new SlotNameVanished(name_vanished_slot);
 
   return g_bus_watch_name_on_connection(Glib::unwrap(connection),
-    name.c_str(), static_cast<GBusNameWatcherFlags>(flags), 
+    name.c_str(), static_cast<GBusNameWatcherFlags>(flags),
     &Bus_Name_Appeared_giomm_callback, &Bus_Name_Vanished_giomm_callback,
     slots, &Bus_Watch_Name_giomm_callback_destroy);
 }