4 files changed, 6 insertions, 9 deletions
diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index f763cdb60..b7d02010b 100644
--- a/libempathy/empathy-contact-list.c
+++ b/libempathy/empathy-contact-list.c
@@ -86,7 +86,7 @@ empathy_contact_list_setup (EmpathyContactList *list)
 
 GossipContact *
 empathy_contact_list_find (EmpathyContactList *list,
-				 const gchar             *id)
+			   const gchar        *id)
 {
 	g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL);
 
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index a4cae35c7..fa62da98f 100644
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -397,7 +397,7 @@ contact_manager_find_foreach (McAccount              *account,
 {
 	data->contact = empathy_contact_list_find (EMPATHY_CONTACT_LIST (list),
 						   data->id);
-	
+
 	if (data->contact) {
 		return TRUE;
 	}
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 73f60491c..8e8a52aca 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -232,7 +232,7 @@ tp_chat_constructor (GType                  type,
 	chat = G_OBJECT_CLASS (empathy_tp_chat_parent_class)->constructor (type, n_props, props);
 
 	priv = GET_PRIV (chat);
-g_print ("**********tp_chat_constructor");
+
 	priv->manager = empathy_contact_manager_new ();
 	priv->list = empathy_contact_manager_get_list (priv->manager, priv->account);
 	priv->mc = gossip_mission_control_new ();
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 43c317e00..60a7fd535 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -447,17 +447,14 @@ tp_contact_list_find (EmpathyContactList *list,
 		      const gchar        *id)
 {
 	EmpathyTpContactListPriv *priv;
-	GossipContact            *contact;
 
 	g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
 
 	priv = GET_PRIV (list);
 
-	contact = g_hash_table_find (priv->contacts,
-				     (GHRFunc) tp_contact_list_find_foreach,
-				     (gchar*) id);
-
-	return NULL;
+	return g_hash_table_find (priv->contacts,
+				  (GHRFunc) tp_contact_list_find_foreach,
+				  (gchar*) id);
 }
 
 static void