[empathy] Renaming: use tp-glib API instead of generating it as an extension

[Guillaume Desmottes <gdesmott src gnome org>]

commit f468afa9675ccbfbecb6cc5de1609783f9b9c136
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Feb 4 13:42:08 2014 +0100

    Renaming: use tp-glib API instead of generating it as an extension

 extensions/Connection_Interface_Renaming.xml |   98 --------------------------
 extensions/Makefile.am                       |    1 -
 extensions/misc.xml                          |    1 -
 libempathy-gtk/empathy-chat.c                |   11 ++--
 4 files changed, 5 insertions(+), 106 deletions(-)
---
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index f72c407..2ec034c 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -13,7 +13,6 @@ EXTRA_DIST = \
     generic-types.xml \
     misc.xml \
     Logger.xml \
-    Connection_Interface_Renaming.xml \
     Channel_Interface_Credentials_Storage.xml \
     Chat_Manager.xml \
     $(NULL)
diff --git a/extensions/misc.xml b/extensions/misc.xml
index f2f15b0..b6247c9 100644
--- a/extensions/misc.xml
+++ b/extensions/misc.xml
@@ -6,7 +6,6 @@
 
 <xi:include href="Logger.xml" />
 <xi:include href="Chat_Manager.xml" />
-<xi:include href="Connection_Interface_Renaming.xml" />
 <xi:include href="Channel_Interface_Credentials_Storage.xml" />
 
 </tp:spec>
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 35f908b..2b5657e 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);
 }