[telepathy-gabble/master] Use gabble_value_array_build instead of manually building the ValueArray.

Mike Ruprecht mike.ruprecht at collabora.co.uk
Tue Dec 29 05:34:52 PST 2009


---
 src/call-stream.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/call-stream.c b/src/call-stream.c
index b8be54a..b996011 100644
--- a/src/call-stream.c
+++ b/src/call-stream.c
@@ -189,14 +189,12 @@ gabble_call_stream_get_property (GObject    *object,
           if (gabble_jingle_factory_get_stun_server (
                 connection->jingle_factory, &stun_server, &stun_port))
             {
-              GValueArray *va = g_value_array_new (2);
-
-              g_value_array_append (va, NULL);
-              g_value_array_append (va, NULL);
-              g_value_init (va->values + 0, G_TYPE_STRING);
-              g_value_init (va->values + 1, G_TYPE_UINT);
-              g_value_take_string (va->values + 0, stun_server);
-              g_value_set_uint (va->values + 1, stun_port);
+              GValueArray *va = gabble_value_array_build (2,
+                  G_TYPE_STRING, stun_server,
+                  G_TYPE_UINT, stun_port,
+                  G_TYPE_INVALID);
+
+              g_free (stun_server);
               g_ptr_array_add (arr, va);
             }
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list