[Telepathy-commits] [telepathy-gabble/master] tube-stream: Implement the "parameters" property correctly
Alban Crequy
alban.crequy at collabora.co.uk
Mon Nov 3 11:21:00 PST 2008
---
src/tube-dbus.c | 2 +-
src/tube-iface.c | 5 +++--
src/tube-stream.c | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 059aeeb..28c7d3a 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -611,7 +611,7 @@ gabble_tube_dbus_set_property (GObject *object,
priv->service = g_value_dup_string (value);
break;
case PROP_PARAMETERS:
- priv->parameters = g_value_get_boxed (value);
+ priv->parameters = g_value_dup_boxed (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
diff --git a/src/tube-iface.c b/src/tube-iface.c
index 614f78b..29def57 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -20,6 +20,8 @@
#include "config.h"
#include "tube-iface.h"
+#include <telepathy-glib/gtypes.h>
+
#include "connection.h"
#include "util.h"
@@ -163,8 +165,7 @@ gabble_tube_iface_base_init (gpointer klass)
"parameters",
"parameters GHashTable",
"GHashTable containing parameters of this tube object.",
- G_TYPE_HASH_TABLE,
- G_PARAM_CONSTRUCT_ONLY |
+ TP_HASH_TYPE_STRING_VARIANT_MAP,
G_PARAM_READWRITE |
G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK |
diff --git a/src/tube-stream.c b/src/tube-stream.c
index afaf9b8..5d4f102 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -1126,7 +1126,7 @@ gabble_tube_stream_set_property (GObject *object,
priv->service = g_value_dup_string (value);
break;
case PROP_PARAMETERS:
- priv->parameters = g_value_get_boxed (value);
+ priv->parameters = g_value_dup_boxed (value);
break;
case PROP_ADDRESS_TYPE:
g_assert (g_value_get_uint (value) == TP_SOCKET_ADDRESS_TYPE_UNIX ||
@@ -1240,7 +1240,7 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
};
static TpDBusPropertiesMixinPropImpl tube_iface_props[] = {
{ "Initiator", "initiator", NULL },
- /*{ "Parameters", "parameters", NULL },*/
+ { "Parameters", "parameters", NULL },
{ "Status", "state", NULL },
{ NULL }
};
--
1.5.6.5
More information about the Telepathy-commits
mailing list