diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-12 23:48:42 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-05-25 15:22:41 +0800 |
| commit | 1a076de82797676d80ce3273dfe075d06111a446 (patch) | |
| tree | da64a1a19d9ae35462867f2954f42d6f5f2abe05 /libempathy-gtk | |
| parent | 0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c (diff) | |
| download | gsoc2013-empathy-1a076de82797676d80ce3273dfe075d06111a446.tar gsoc2013-empathy-1a076de82797676d80ce3273dfe075d06111a446.tar.gz gsoc2013-empathy-1a076de82797676d80ce3273dfe075d06111a446.tar.bz2 gsoc2013-empathy-1a076de82797676d80ce3273dfe075d06111a446.tar.lz gsoc2013-empathy-1a076de82797676d80ce3273dfe075d06111a446.tar.xz gsoc2013-empathy-1a076de82797676d80ce3273dfe075d06111a446.tar.zst gsoc2013-empathy-1a076de82797676d80ce3273dfe075d06111a446.zip | |
remove empathy_tp_chat_get_connection and priv->connection
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index ef4d7a53d..cf3336bdf 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -700,7 +700,7 @@ nick_command_supported (EmpathyChat *chat) EmpathyChatPriv * priv = GET_PRIV (chat); TpConnection *connection; - connection = empathy_tp_chat_get_connection (priv->tp_chat); + connection = tp_channel_borrow_connection (TP_CHANNEL (priv->tp_chat)); return tp_proxy_has_interface_by_id (connection, EMP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING); } @@ -975,7 +975,7 @@ chat_command_whois (EmpathyChat *chat, EmpathyChatPriv *priv = GET_PRIV (chat); TpConnection *conn; - conn = empathy_tp_chat_get_connection (priv->tp_chat); + conn = tp_channel_borrow_connection ((TpChannel *) priv->tp_chat); tp_connection_get_contacts_by_id (conn, /* Element 0 of 'strv' is "whois"; element 1 is the contact ID * entered by the user (including spaces, if any). */ @@ -3636,7 +3636,6 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, g_return_if_fail (EMPATHY_IS_CHAT (chat)); g_return_if_fail (EMPATHY_IS_TP_CHAT (tp_chat)); - g_return_if_fail (empathy_tp_chat_is_ready (tp_chat)); if (priv->tp_chat) { return; |