Merge branch 'gnome-3-8'

[empathy.git] / src / empathy-invite-participant-dialog.c

diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index ecbf00be93d313fce53fe58f181fc130ccf8358f..e562dc5644bf3e1865aba015a598e0a37c73c8f7 100644 (file)
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -10,17 +10,12 @@
  */
 
 #include "config.h"
-
-#include <glib/gi18n.h>
-#include <folks/folks-telepathy.h>
-
 #include "empathy-invite-participant-dialog.h"
 
-#include <libempathy/empathy-utils.h>
+#include <glib/gi18n.h>
 
-#include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-individual-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-contact-chooser.h"
+#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyInviteParticipantDialog,
     empathy_invite_participant_dialog, GTK_TYPE_DIALOG);
@@ -114,7 +109,7 @@ get_tp_contact_for_chat (EmpathyInviteParticipantDialog *self,
 {
   TpConnection *chat_conn;
 
-  chat_conn = tp_channel_borrow_connection (TP_CHANNEL (self->priv->tp_chat));
+  chat_conn = tp_channel_get_connection (TP_CHANNEL (self->priv->tp_chat));
   if (chat_conn == NULL)
     return NULL;
 
@@ -177,7 +172,7 @@ has_contact_list (EmpathyInviteParticipantDialog *self)
 {
   TpConnection *conn;
 
-  conn = tp_channel_borrow_connection (TP_CHANNEL (self->priv->tp_chat));
+  conn = tp_channel_get_connection (TP_CHANNEL (self->priv->tp_chat));
 
   return tp_proxy_has_interface_by_id (conn,
       TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST);