[glibmm] fix the build

[Murray Cumming <murrayc src gnome org>]

commit 4229b122f28454baf1b1726b553399f26b199808
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Jan 18 12:12:31 2016 +0100

    fix the build
    
    I was editing the generated files. Silly me.

 glib/src/convert.ccg   |    4 ++--
 glib/src/iochannel.ccg |    2 +-
 glib/src/keyfile.ccg   |    4 ++--
 glib/src/markup.ccg    |    2 +-
 glib/src/regex.ccg     |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/glib/src/convert.ccg b/glib/src/convert.ccg
index cc17285..135f135 100644
--- a/glib/src/convert.ccg
+++ b/glib/src/convert.ccg
@@ -173,7 +173,7 @@ Glib::ustring locale_to_utf8(const std::string& opsys_string)
 
   if(gerror) ::Glib::Error::throw_exception(gerror);
 
-  const auto scoped_buf = make_unique_ptr_gfree(buf));
+  const auto scoped_buf = make_unique_ptr_gfree(buf);
   return Glib::ustring(scoped_buf.get(), scoped_buf.get() + bytes_written);
 }
 
@@ -231,7 +231,7 @@ std::string filename_from_uri(const Glib::ustring& uri, Glib::ustring& hostname)
   if(gerror) ::Glib::Error::throw_exception(gerror);
 
   // Let's take ownership at this point.
-  const auto scoped_buf = make_unique_ptr_gfree(buf));
+  const auto scoped_buf = make_unique_ptr_gfree(buf);
 
   if(hostname_buf)
     hostname = make_unique_ptr_gfree(buf).get();
diff --git a/glib/src/iochannel.ccg b/glib/src/iochannel.ccg
index c1d88e4..373d1b9 100644
--- a/glib/src/iochannel.ccg
+++ b/glib/src/iochannel.ccg
@@ -273,7 +273,7 @@ IOStatus IOChannel::read_to_end(Glib::ustring& str)
 
 IOStatus IOChannel::read(Glib::ustring& str, gsize count)
 {
-  Glib::UniquePtrGFree<char> buf (g_new(char, count));
+  auto buf = make_unique_ptr_gfree(g_new(char, count));
   GError* gerror = nullptr;
   gsize   bytes = 0;
 
diff --git a/glib/src/keyfile.ccg b/glib/src/keyfile.ccg
index 7292d2e..9c6e1a7 100644
--- a/glib/src/keyfile.ccg
+++ b/glib/src/keyfile.ccg
@@ -89,7 +89,7 @@ bool KeyFile::load_from_data_dirs(const std::string& file, std::string& full_pat
     Glib::Error::throw_exception(gerror);
 
   if(full_path_c)
-    full_path = Glib::make_unique_ptr_gfree(buf).get();
+    full_path = Glib::make_unique_ptr_gfree(full_path_c).get();
   else
     full_path.erase();
 
@@ -116,7 +116,7 @@ bool KeyFile::load_from_dirs(const std::string& file, const Glib::ArrayHandle<st
   }
 
   if(full_path_c)
-    full_path = Glib::make_unique_ptr_gfree(buf).get();
+    full_path = Glib::make_unique_ptr_gfree(full_path_c).get();
   else
     full_path.erase();
 
diff --git a/glib/src/markup.ccg b/glib/src/markup.ccg
index 246510f..f04b2fb 100644
--- a/glib/src/markup.ccg
+++ b/glib/src/markup.ccg
@@ -29,7 +29,7 @@ namespace Markup
 
 Glib::ustring escape_text(const Glib::ustring& text)
 {
-  const Glib::UniquePtrGFree<char> buf (g_markup_escape_text(text.data(), text.bytes()));
+  const auto buf = make_unique_ptr_gfree(g_markup_escape_text(text.data(), text.bytes()));
   return Glib::ustring(buf.get());
 }
 
diff --git a/glib/src/regex.ccg b/glib/src/regex.ccg
index 0ffe5f7..bdfd261 100644
--- a/glib/src/regex.ccg
+++ b/glib/src/regex.ccg
@@ -36,7 +36,7 @@ Glib::RefPtr<Glib::Regex> Regex::create(const Glib::ustring& pattern,
 // static
 Glib::ustring Regex::escape_string(const Glib::ustring& string)
 {
-  const Glib::UniquePtrGFree<char> buf (g_regex_escape_string(string.raw().c_str(),
+  const auto buf = make_unique_ptr_gfree(g_regex_escape_string(string.raw().c_str(),
                                                          string.raw().size()));
   return Glib::ustring(buf.get());
 }