From c85af12d45928aecb20a087a009e1f5f19f980e2 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 17 Oct 2013 19:37:51 +0200
Subject: StickerDatabase: return std::string

---
 src/StickerDatabase.hxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/StickerDatabase.hxx')

diff --git a/src/StickerDatabase.hxx b/src/StickerDatabase.hxx
index 834d9a703..46a9ba52d 100644
--- a/src/StickerDatabase.hxx
+++ b/src/StickerDatabase.hxx
@@ -44,6 +44,8 @@
 
 #include "Compiler.h"
 
+#include <string>
+
 class Error;
 class Path;
 struct sticker;
@@ -72,10 +74,10 @@ bool
 sticker_enabled(void);
 
 /**
- * Returns one value from an object's sticker record.  The caller must
- * free the return value with g_free().
+ * Returns one value from an object's sticker record.  Returns an
+ * empty string if the value doesn't exist.
  */
-char *
+std::string
 sticker_load_value(const char *type, const char *uri, const char *name);
 
 /**
-- 
cgit v1.2.3