Merge branch 'fix-586098'

Conflicts:
	libempathy-gtk/empathy-chat.c

diff --cc libempathy-gtk/empathy-chat.c
index 7984b8a3a622825fa1bda41adef05493fec0fe2a,b6356f8343f6e715a1f4cc0bfa7a0351282cfe87..b2fefee5fad2471e515a67668e3d077aa767cfd3
--- 1/libempathy-gtk/empathy-chat.c
--- 2/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@@ -72,9 -72,9 +72,9 @@@ typedef struct 
        gboolean           show_contacts;
  
        EmpathyLogManager *log_manager;
 -      EmpathyAccountManager *account_manager;
 +      TpAccountManager  *account_manager;
-       GSList            *sent_messages;
-       gint               sent_messages_index;
+       GList             *input_history;
+       GList             *input_history_current;
        GList             *compositors;
        GCompletion       *completion;
        guint              composing_stop_timeout_id;
@@@ -1736,12 -1908,14 +1937,12 @@@ empathy_chat_init (EmpathyChat *chat
        chat->priv = priv;
        priv->log_manager = empathy_log_manager_dup_singleton ();
        priv->contacts_width = -1;
-       priv->sent_messages = NULL;
-       priv->sent_messages_index = -1;
+       priv->input_history = NULL;
+       priv->input_history_current = NULL;
 -      priv->account_manager = empathy_account_manager_dup_singleton ();
 +      priv->account_manager = tp_account_manager_dup ();
  
 -      g_signal_connect (priv->account_manager,
 -                        "new-connection",
 -                        G_CALLBACK (chat_new_connection_cb),
 -                        chat);
 +      tp_account_manager_prepare_async (priv->account_manager, NULL,
 +                                        account_manager_prepared_cb, chat);
  
        empathy_conf_get_bool (empathy_conf_get (),
                               EMPATHY_PREFS_CHAT_SHOW_CONTACTS_IN_ROOMS,