[empathy: 2/4] tp-chat: when seeing if a chat can be upgraded, don't worry about handle type
- From: Jonny Lamb <jonnylamb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 2/4] tp-chat: when seeing if a chat can be upgraded, don't worry about handle type
- Date: Thu, 11 Mar 2010 11:37:37 +0000 (UTC)
commit 13a7c40c5aaf9b6ff9d75073775472f413959033
Author: Jonny Lamb <jonnylamb gnome org>
Date: Wed Mar 10 18:41:08 2010 +0000
tp-chat: when seeing if a chat can be upgraded, don't worry about handle type
When you upgrade a gtalk 1-1 chat to a PMUC, it moves from
[ChannelType=TEXT, TargetHandleType=CONTACT] to [ChannelType=TEXT,
TargetHandleType=ROOM].
When you upgrade an MSN 1-1 chat to a multi-user chat in butterfly, it
moves from [ChannelType=TEXT, TargetHandleType=CONTACT] to
[ChannelType=TEXT, TargetHandleType=NONE].
Both of these cases have the 1-1 chat properties set as fixed
properties in a class in their connection's RCC. They both also have
the upgraded set of properties as above fixed, and
o.fd.Tp.Channel.Interface.Conference(.DRAFT) in the appropriate
Allowed_Properties array.
Empathy used to look for this said channel interface in the allowed
properties of a TargetHandleType=ROOM class. As butterfly uses
TargetHandleType=NONE, this isn't so useful, so let's not care about
the handle type to fit around both gtalk and MSN.
Signed-off-by: Jonny Lamb <jonnylamb gnome org>
libempathy/empathy-tp-chat.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index cba102a..bba6733 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1280,7 +1280,7 @@ tp_chat_constructor (GType type,
list = empathy_dispatcher_find_requestable_channel_classes (
dispatcher, connection,
tp_channel_get_channel_type (priv->channel),
- TP_HANDLE_TYPE_ROOM, NULL);
+ TP_UNKNOWN_HANDLE_TYPE, NULL);
for (ptr = list; ptr; ptr = ptr->next) {
GValueArray *array = ptr->data;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]