[Telepathy-commits] [telepathy-salut/master] fix conflict resolution: tube state property has to be readonly

[Guillaume Desmottes]

---
 src/tube-iface.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/tube-iface.c b/src/tube-iface.c
index 4740ea5..c4f9c9c 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -192,7 +192,7 @@ salut_tube_iface_base_init (gpointer klass)
           "Tube state",
           "The SalutTubeState of this DBUS tube object",
           0, G_MAXUINT32, TP_TUBE_STATE_REMOTE_PENDING,
-          G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
       g_object_interface_install_property (klass, param_spec);
 
       initialized = TRUE;
-- 
1.5.6.5