summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2011-03-29 10:32:47 +0200
committerMurray Cumming <murrayc@murrayc.com>2011-03-29 10:32:47 +0200
commit07981769f4b9795b156b8f2bfddd916b4de6d6c3 (patch)
tree7995f1ad6d7b7ff8096845faca76d408f9353cbd
parent177e20fbfad6e5bcce5f9d7f8472f1db22bcacf2 (diff)
downloadglibmm-07981769f4b9795b156b8f2bfddd916b4de6d6c3.tar.gz
Variant<std::string>::get(): Correct my custom implementation.
* glib/src/variant.ccg: Really call g_variant_get_bytestring().
-rw-r--r--ChangeLog6
-rw-r--r--glib/src/variant.ccg2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e5930749..6d592aa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2011-03-29 Murray Cumming <murrayc@murrayc.com>
+ Variant<std::string>::get(): Correct my custom implementation.
+
+ * glib/src/variant.ccg: Really call g_variant_get_bytestring().
+
+2011-03-29 Murray Cumming <murrayc@murrayc.com>
+
Variant: Move constructor definitions into the .cc file.
* glib/src/variant.[hg|ccg]: The implementations of constructors for
diff --git a/glib/src/variant.ccg b/glib/src/variant.ccg
index 426cd73c..39509f03 100644
--- a/glib/src/variant.ccg
+++ b/glib/src/variant.ccg
@@ -311,7 +311,7 @@ std::string Variant<std::string>::get() const
const char* pch = 0;
if(vtype.equal(VARIANT_TYPE_BYTESTRING))
- pch = g_variant_get_string(gobject_, 0);
+ pch = g_variant_get_bytestring(gobject_);
else //g_variant_get_string() cna handle strings, object paths, and signatures.
pch = g_variant_get_string(gobject_, 0);