[empathy: 4/4] Merge branch 'fix-586098'

[Danielle Madeley <davyd src gnome org>]

commit f72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd
Merge: 8b15780... ede64d4...
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Tue Nov 3 23:55:26 2009 +1100

    Merge branch 'fix-586098'
    
    Conflicts:
    	libempathy-gtk/empathy-chat.c

 libempathy-gtk/empathy-chat.c |  301 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 251 insertions(+), 50 deletions(-)
---
diff --cc libempathy-gtk/empathy-chat.c
index 7984b8a,b6356f8..b2fefee
--- a/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,