summaryrefslogtreecommitdiff
path: root/src/muc-manager.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/muc-manager.c')
-rw-r--r--src/muc-manager.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/muc-manager.c b/src/muc-manager.c
index db4978e1..41cd3438 100644
--- a/src/muc-manager.c
+++ b/src/muc-manager.c
@@ -360,12 +360,12 @@ salut_muc_manager_type_foreach_channel_class (GType type,
g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType",
handle_type_value);
- /* im.telepathy1.Channel.Type.Text */
+ /* org.freedesktop.Telepathy.Channel.Type.Text */
g_value_set_static_string (channel_type_value, TP_IFACE_CHANNEL_TYPE_TEXT);
func (type, table, muc_channel_allowed_properties,
user_data);
- /* im.telepathy1.Channel.Type.StreamTube */
+ /* org.freedesktop.Telepathy.Channel.Type.StreamTube */
g_value_set_static_string (channel_type_value,
TP_IFACE_CHANNEL_TYPE_STREAM_TUBE);
func (type, table, salut_tube_stream_channel_get_allowed_properties (),
@@ -1108,6 +1108,11 @@ invite_stanza_callback (WockyPorter *porter,
/* FIXME handle properly */
g_assert (chan != NULL);
+#ifdef ENABLE_OLPC
+ salut_connection_olpc_observe_invitation (priv->connection, room_handle,
+ inviter_handle, invite);
+#endif
+
salut_muc_channel_invited (chan, inviter_handle, reason, NULL);
return TRUE;