Merge remote-tracking branch 'origin/gnome-3-8'

[empathy.git] / libempathy / empathy-tp-chat.h

diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index d3ad334b3bec0a5217717d775a8c823eca226823..20fb4e1e06b0dcb3579b7665ff67e62fe3447fca 100644 (file)
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -22,9 +22,7 @@
 #define __EMPATHY_TP_CHAT_H__
 
 #include <glib.h>
-
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-message.h"
 #include "empathy-contact.h"
@@ -65,7 +63,6 @@ GQuark empathy_tp_chat_get_feature_ready (void) G_GNUC_CONST;
 GType empathy_tp_chat_get_type (void) G_GNUC_CONST;
 
 EmpathyTpChat * empathy_tp_chat_new (TpSimpleClientFactory *factory,
-    TpAccount *account,
     TpConnection *connection,
     const gchar *object_path,
     const GHashTable *immutable_properties);