[empathy/next: 8/8] Merge branch 'master' into next

[Guillaume Desmottes <gdesmott src gnome org>]

commit bdf3e5a16f0e6d5c85fee80df675e5cbc6c00e39
Merge: a133ce0 f468afa
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Feb 4 14:59:49 2014 +0100

    Merge branch 'master' into next
    
    Conflicts:
        configure.ac
        extensions/Connection_Interface_Renaming.xml
        extensions/Makefile.am
        extensions/misc.xml

 NEWS                                         |   15 +
 extensions/Connection_Interface_Renaming.xml |   98 --
 extensions/Makefile.am                       |    1 -
 extensions/misc.xml                          |    1 -
 libempathy-gtk/empathy-chat.c                |   11 +-
 po/kn.po                                     | 2283 ++++++++++----------------
 po/zh_HK.po                                  |  727 +++++----
 po/zh_TW.po                                  |  734 +++++----
 src/empathy-about-dialog.c                   |   29 +-
 9 files changed, 1619 insertions(+), 2280 deletions(-)
---
diff --cc extensions/Makefile.am
index c11de35,2ec034c..a9cf31b
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@@ -13,7 -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 --cc extensions/misc.xml
index 91e9a94,b6247c9..1cf8c72
--- a/extensions/misc.xml
+++ b/extensions/misc.xml
@@@ -6,6 -6,6 +6,5 @@@
  
  <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 --cc libempathy-gtk/empathy-chat.c
index d1732be,2b5657e..4a53a02
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@@ -759,7 -760,7 +758,7 @@@ nick_command_supported (EmpathyChat *ch
  
        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);
++              TP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING1);
  }
  
  static gboolean
@@@ -901,11 -902,11 +900,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,
++      tp_cli_connection_interface_renaming1_call_request_rename (conn, -1,
                strv[1], callback_for_request_rename, NULL, NULL, NULL);
  }