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 8d9d7129218dc72c68ae9ac383bafd136fe3fe3e..e562dc5644bf3e1865aba015a598e0a37c73c8f7 100644 (file)
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -9,16 +9,13 @@
  *    Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
-#include <glib/gi18n.h>
-#include <folks/folks-telepathy.h>
-
+#include "config.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);
@@ -112,7 +109,9 @@ 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;
 
   return empathy_get_tp_contact_for_individual (individual, chat_conn);
 }
@@ -141,22 +140,22 @@ filter_individual (EmpathyContactChooser *chooser,
     return FALSE;
 
   /* Filter out contacts which are already in the chat */
-  members = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (
-        self->priv->tp_chat));
+  members = empathy_tp_chat_get_members (self->priv->tp_chat);
 
   for (l = members; l != NULL; l = g_list_next (l))
     {
       EmpathyContact *member = l->data;
-      TpHandle handle;
+      TpContact *owner;
 
-      /* Try to get the non-channel specific handle. */
-      handle = tp_channel_group_get_handle_owner (
+      /* Try to get the non-channel specific contact. */
+      owner = tp_channel_group_get_contact_owner (
           TP_CHANNEL (self->priv->tp_chat),
-          empathy_contact_get_handle (member));
-      if (handle == 0)
-        handle = empathy_contact_get_handle (member);
+          empathy_contact_get_tp_contact (member));
+
+      if (owner == NULL)
+        owner = empathy_contact_get_tp_contact (member);
 
-      if (handle == tp_contact_get_handle (contact))
+      if (owner == contact)
         {
           display = FALSE;
           break;
@@ -173,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);