Don't leak method call results (regression in 0.23.1)

Commit 7ffbde3f used common code for two blocks that were not actually
the same. dbus-glib method calls give the caller a new reference
to the results, whereas dbus-glib signals do not. As a result,
the method-call case needs to either free the results, or get them
freed by giving ownership to the GValueArray. I chose to give
ownership.

Reviewed-by: Guillaume Desmottes

2 files changed, 23 insertions, 2 deletions

diff --git a/tools/glib-client-gen.py b/tools/glib-client-gen.py
index db87741d6..4d1d0bfa7 100644
--- a/tools/glib-client-gen.py
+++ b/tools/glib-client-gen.py
@@ -30,7 +30,7 @@ from getopt import gnu_getopt
 from libtpcodegen import file_set_contents, key_by_name, u
 from libglibcodegen import (Signature, type_to_gtype,
         get_docstring, xml_escape, get_deprecated, copy_into_gvalue,
-        value_getter)
+        value_getter, move_into_gvalue)
 
 NS_TP = "http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
 
@@ -563,7 +563,7 @@ class Generator(object):
                 collector('  g_value_unset (args->values + %d);' % i)
                 collector('  g_value_init (args->values + %d, %s);'
                           % (i, gtype))
-                collector('  ' + copy_into_gvalue('args->values + %d' % i,
+                collector('  ' + move_into_gvalue('args->values + %d' % i,
                     gtype, marshaller, name))
 
             collector('  tp_proxy_pending_call_v0_take_results (user_data, '
diff --git a/tools/libglibcodegen.py b/tools/libglibcodegen.py
index c03544fe2..33867dd0c 100644
--- a/tools/libglibcodegen.py
+++ b/tools/libglibcodegen.py
@@ -171,6 +171,27 @@ def type_to_gtype(s):
     # we just don't know ..
     raise Exception("don't know the GType for " + s)
 
+def move_into_gvalue(gvaluep, gtype, marshaller, name):
+    if gtype == 'G_TYPE_STRING':
+        return 'g_value_take_string (%s, %s);' % (gvaluep, name)
+    elif marshaller == 'BOXED':
+        return 'g_value_take_boxed (%s, %s);' % (gvaluep, name)
+    elif gtype == 'G_TYPE_UCHAR':
+        return 'g_value_set_uchar (%s, %s);' % (gvaluep, name)
+    elif gtype == 'G_TYPE_BOOLEAN':
+        return 'g_value_set_boolean (%s, %s);' % (gvaluep, name)
+    elif gtype == 'G_TYPE_INT':
+        return 'g_value_set_int (%s, %s);' % (gvaluep, name)
+    elif gtype == 'G_TYPE_UINT':
+        return 'g_value_set_uint (%s, %s);' % (gvaluep, name)
+    elif gtype == 'G_TYPE_INT64':
+        return 'g_value_set_int (%s, %s);' % (gvaluep, name)
+    elif gtype == 'G_TYPE_UINT64':
+        return 'g_value_set_uint64 (%s, %s);' % (gvaluep, name)
+    elif gtype == 'G_TYPE_DOUBLE':
+        return 'g_value_set_double (%s, %s);' % (gvaluep, name)
+    else:
+        raise AssertionError("Don't know how to put %s in a GValue" % gtype)
 
 def copy_into_gvalue(gvaluep, gtype, marshaller, name):
     if gtype == 'G_TYPE_STRING':