diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-03-07 12:06:29 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-04-06 13:48:32 +0800 |
| commit | 0b213f4fae18f24fd7b162ca19c63249cd360e43 (patch) | |
| tree | 426a0650907e74f3ecc20446e2879e4f3999b182 /libempathy | |
| parent | 73d8a18c6def748d78e91f0dda1145771c620b53 (diff) | |
| download | gsoc2013-empathy-0b213f4fae18f24fd7b162ca19c63249cd360e43.tar gsoc2013-empathy-0b213f4fae18f24fd7b162ca19c63249cd360e43.tar.gz gsoc2013-empathy-0b213f4fae18f24fd7b162ca19c63249cd360e43.tar.bz2 gsoc2013-empathy-0b213f4fae18f24fd7b162ca19c63249cd360e43.tar.lz gsoc2013-empathy-0b213f4fae18f24fd7b162ca19c63249cd360e43.tar.xz gsoc2013-empathy-0b213f4fae18f24fd7b162ca19c63249cd360e43.tar.zst gsoc2013-empathy-0b213f4fae18f24fd7b162ca19c63249cd360e43.zip | |
[ChatroomManager] find windows by channel path, not by TargetID
Otherwise two separate channels with the same TargetID (i.e. SMSChannel = False
and SMSChannel = True) will not result in two separate chat windows in Empathy.
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=644085
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 12 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.h | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 462f8a77b..e8542a021 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -1960,3 +1960,15 @@ empathy_tp_chat_is_invited (EmpathyTpChat *self, return tp_channel_group_get_local_pending_info (priv->channel, self_handle, inviter, NULL, NULL); } + +const char * +empathy_tp_chat_get_channel_path (EmpathyTpChat *self) +{ + EmpathyTpChatPriv *priv; + + g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); + + priv = GET_PRIV (self); + + return tp_proxy_get_object_path (priv->channel); +} diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index 8858f4971..fe3de4ea7 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -106,6 +106,8 @@ void empathy_tp_chat_join (EmpathyTpChat *chat); gboolean empathy_tp_chat_is_invited (EmpathyTpChat *chat, TpHandle *inviter); +const char * empathy_tp_chat_get_channel_path (EmpathyTpChat *chat); + G_END_DECLS #endif /* __EMPATHY_TP_CHAT_H__ */ |