* 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 <telepathy-glib/telepathy-glib-dbus.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);
gtk_widget_set_sensitive (self->priv->invite_button, selected != NULL);
}
+static void
+activate_cb (GtkWidget *chooser,
+ EmpathyInviteParticipantDialog *self)
+{
+ gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_ACCEPT);
+}
+
/* Return the TpContact of @individual which is on the same connection as the
* EmpathyTpChat */
static TpContact *
{
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);
}
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;
return display;
}
+static gboolean
+has_contact_list (EmpathyInviteParticipantDialog *self)
+{
+ TpConnection *conn;
+
+ 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);
+}
+
static void
invite_participant_dialog_constructed (GObject *object)
{
g_signal_connect (self->priv->chooser, "selection-changed",
G_CALLBACK (selection_changed_cb), self);
+ g_signal_connect (self->priv->chooser, "activate",
+ G_CALLBACK (activate_cb), self);
self->priv->invite_button = gtk_dialog_add_button (dialog, _("Invite"),
GTK_RESPONSE_ACCEPT);
gtk_window_set_title (GTK_WINDOW (self), _("Invite Participant"));
gtk_window_set_role (GTK_WINDOW (self), "invite_participant");
- /* Set a default height so a few contacts are displayed */
- gtk_window_set_default_size (GTK_WINDOW (self), -1, 400);
+ if (has_contact_list (self))
+ {
+ /* Set a default height so a few contacts are displayed */
+ gtk_window_set_default_size (GTK_WINDOW (self), -1, 400);
+ }
+ else
+ {
+ /* No need to display an empty treeview (ie IRC) */
+ empathy_contact_chooser_show_tree_view (
+ EMPATHY_CONTACT_CHOOSER (self->priv->chooser), FALSE);
+ }
}
static void