[empathy/next: 6/6] Merge branch 'master' into next-remove-ext

[Guillaume Desmottes <gdesmott src gnome org>]

commit 79b600aad368d1c0a755e0bd3505a616761691ba
Merge: 3e097e4 e5995a2
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Feb 7 10:04:36 2014 +0100

    Merge branch 'master' into next-remove-ext
    
    Conflicts:
        libempathy-gtk/empathy-chat.c
        libempathy/empathy-ft-factory.c
        libempathy/empathy-tp-chat.c
        src/empathy-call-window.c
        src/empathy-chat-manager.c

 libempathy-gtk/empathy-call-utils.c |    2 +-
 libempathy-gtk/empathy-chat.c       |    2 +-
 libempathy/Makefile.am              |    1 +
 libempathy/empathy-bus-names.h      |   29 +
 libempathy/empathy-ft-factory.c     |    2 +-
 libempathy/empathy-request-util.c   |    5 +-
 libempathy/empathy-request-util.h   |   12 +-
 libempathy/empathy-tp-chat.c        |    2 +-
 po/an.po                            | 3452 +++++++++++++++++------------------
 src/empathy-accounts.c              |    5 +-
 src/empathy-audio-src.c             |    2 +-
 src/empathy-call-factory.c          |    2 +-
 src/empathy-call-window.c           |    2 +-
 src/empathy-call.c                  |    5 +-
 src/empathy-chat-manager.c          |   10 +-
 src/empathy-chat.c                  |    5 +-
 src/empathy-debugger.c              |    5 +-
 src/empathy.c                       |    5 +-
 18 files changed, 1776 insertions(+), 1772 deletions(-)
---
diff --cc libempathy-gtk/empathy-chat.c
index 4a53a02,daec195..90907fb
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@@ -861,8 -863,8 +861,8 @@@ chat_command_msg_internal (EmpathyChat 
        data->chat = chat;
        data->message = g_strdup (message);
  
 -      tp_account_channel_request_ensure_and_observe_channel_async (req,
 +      tp_account_channel_request_ensure_channel_async (req,
-               EMPATHY_CHAT_BUS_NAME, NULL, chat_command_msg_cb, data);
+               EMPATHY_CHAT_TP_BUS_NAME, NULL, chat_command_msg_cb, data);
  
        g_object_unref (req);
        g_hash_table_unref (request);
diff --cc libempathy/empathy-ft-factory.c
index 98ae675,f15f9fb..0f5a0b5
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@@ -192,7 -205,7 +192,7 @@@ empathy_ft_factory_init (EmpathyFTFacto
    am = tp_account_manager_dup ();
  
    priv->handler = tp_simple_handler_new_with_am (am, FALSE, FALSE,
-       EMPATHY_FT_BUS_NAME_SUFFIX, FALSE, handle_channel_cb, self, NULL);
 -      EMPATHY_FT_TP_BUS_NAME_SUFFIX, FALSE, handle_channels_cb, self, NULL);
++      EMPATHY_FT_TP_BUS_NAME_SUFFIX, FALSE, handle_channel_cb, self, NULL);
  
    tp_base_client_take_handler_filter (priv->handler, tp_asv_new (
          TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
diff --cc libempathy/empathy-tp-chat.c
index 3f2286f,caa3960..a631bcf
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@@ -224,8 -224,8 +224,8 @@@ empathy_tp_chat_add (EmpathyTpChat *sel
  
        /* Although this is a MUC, it's anonymous, so CreateChannel is
         * valid. */
 -      tp_account_channel_request_create_and_observe_channel_async (req,
 +      tp_account_channel_request_create_channel_async (req,
-           EMPATHY_CHAT_BUS_NAME, NULL, create_conference_cb, NULL);
+           EMPATHY_CHAT_TP_BUS_NAME, NULL, create_conference_cb, NULL);
  
        g_object_unref (req);
        g_hash_table_unref (props);
diff --cc src/empathy-call-factory.c
index d660560,3b57761..e62e63f
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@@ -159,10 -160,13 +159,10 @@@ empathy_call_factory_initialise (void
    factory = empathy_client_factory_dup ();
  
    self = EMPATHY_CALL_FACTORY (g_object_new (EMPATHY_TYPE_CALL_FACTORY,
 -      "account-manager", am,
        "factory", factory,
-       "name", EMPATHY_CALL_BUS_NAME_SUFFIX,
+       "name", EMPATHY_CALL_TP_BUS_NAME_SUFFIX,
        NULL));
  
 -  g_object_unref (am);
    g_object_unref (factory);
  
    return self;
diff --cc src/empathy-call-window.c
index 4d55285,a54346c..9e192b5
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@@ -1510,8 -1510,8 +1510,8 @@@ empathy_call_window_incoming_call_respo
    switch (response_id)
      {
        case GTK_RESPONSE_ACCEPT:
 -        tp_channel_dispatch_operation_handle_with_time_async (
 +        tp_channel_dispatch_operation_handle_with_async (
-             self->priv->pending_cdo, EMPATHY_CALL_BUS_NAME,
+             self->priv->pending_cdo, EMPATHY_CALL_TP_BUS_NAME,
              empathy_get_current_action_time (), NULL, NULL);
  
          tp_clear_object (&self->priv->pending_cdo);
diff --cc src/empathy-chat-manager.c
index 53bba99,b3b02c5..842fdc2
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@@ -273,7 -290,7 +275,7 @@@ empathy_chat_manager_init (EmpathyChatM
  
    /* Text channels handler */
    priv->handler = tp_simple_handler_new_with_am (am, FALSE, FALSE,
-       EMPATHY_CHAT_BUS_NAME_SUFFIX, FALSE, handle_channel, self, NULL);
 -      EMPATHY_CHAT_TP_BUS_NAME_SUFFIX, FALSE, handle_channels, self, NULL);
++      EMPATHY_CHAT_TP_BUS_NAME_SUFFIX, FALSE, handle_channel, self, NULL);
  
    g_object_unref (am);