Merged revisions 6293,6296-6306,6308 via svnmerge from

[ardour.git] / libs / glibmm2 / glib / glibmm / fileutils.cc

diff --git a/libs/glibmm2/glib/glibmm/fileutils.cc b/libs/glibmm2/glib/glibmm/fileutils.cc
index 38850871a0c2e14aaf805d376a354889b5ac25a3..422442fc41fc9b7561fa720ee35130702f3d6212 100644 (file)
--- a/libs/glibmm2/glib/glibmm/fileutils.cc
+++ b/libs/glibmm2/glib/glibmm/fileutils.cc
@@ -24,9 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib/gdir.h>
-#include <glib/gfileutils.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <glibmm/utility.h>
 
 
@@ -58,7 +56,7 @@ Dir::~Dir()
 std::string Dir::read_name()
 {
   const char *const name = g_dir_read_name(gobject_);
-  return (name) ? std::string(name) : std::string();
+  return Glib::convert_const_gchar_ptr_to_stdstring(name);
 }
 
 void Dir::rewind()