diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-04 20:42:08 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-04 20:43:00 +0800 |
| commit | f468afa9675ccbfbecb6cc5de1609783f9b9c136 (patch) | |
| tree | 0f3be49d24ebaa4e118cdf20eaf305cb0cbcd912 /libempathy-gtk | |
| parent | 19298a84cb67fc761b93b8eeb1d82b952932cf25 (diff) | |
| download | gsoc2013-empathy-f468afa9675ccbfbecb6cc5de1609783f9b9c136.tar gsoc2013-empathy-f468afa9675ccbfbecb6cc5de1609783f9b9c136.tar.gz gsoc2013-empathy-f468afa9675ccbfbecb6cc5de1609783f9b9c136.tar.bz2 gsoc2013-empathy-f468afa9675ccbfbecb6cc5de1609783f9b9c136.tar.lz gsoc2013-empathy-f468afa9675ccbfbecb6cc5de1609783f9b9c136.tar.xz gsoc2013-empathy-f468afa9675ccbfbecb6cc5de1609783f9b9c136.tar.zst gsoc2013-empathy-f468afa9675ccbfbecb6cc5de1609783f9b9c136.zip | |
Renaming: use tp-glib API instead of generating it as an extension
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 35f908b7b..2b5657e8e 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -51,7 +51,6 @@ #include "empathy-theme-manager.h" #include "empathy-ui-utils.h" #include "empathy-utils.h" -#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT #include "empathy-debug.h" @@ -761,7 +760,7 @@ nick_command_supported (EmpathyChat *chat) connection = tp_channel_get_connection (TP_CHANNEL (priv->tp_chat)); return tp_proxy_has_interface_by_id (connection, - EMP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING); + TP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING); } static gboolean @@ -888,7 +887,7 @@ chat_command_msg (EmpathyChat *chat, } static void -callback_for_request_rename (TpProxy *proxy, +callback_for_request_rename (TpConnection *conn, const GError *error, gpointer user_data, GObject *weak_object) @@ -903,11 +902,11 @@ chat_command_nick (EmpathyChat *chat, GStrv strv) { EmpathyChatPriv *priv = GET_PRIV (chat); - TpProxy *proxy; + TpConnection *conn; - proxy = TP_PROXY (tp_account_get_connection (priv->account)); + conn = tp_account_get_connection (priv->account); - emp_cli_connection_interface_renaming_call_request_rename (proxy, -1, + tp_cli_connection_interface_renaming_call_request_rename (conn, -1, strv[1], callback_for_request_rename, NULL, NULL, NULL); } |