#include "empathy-contact-chooser.h"
+#include <libempathy/empathy-utils.h>
+
+#include <libempathy-gtk/empathy-individual-store-manager.h>
#include <libempathy-gtk/empathy-individual-view.h>
#include <libempathy-gtk/empathy-ui-utils.h>
G_DEFINE_TYPE (EmpathyContactChooser,
empathy_contact_chooser, GTK_TYPE_BOX);
-enum
-{
- PROP_TP_CHAT = 1
-};
-
enum {
SIG_SELECTION_CHANGED,
+ SIG_ACTIVATE,
LAST_SIGNAL
};
struct _EmpathyContactChooserPrivate
{
- EmpathyTpChat *tp_chat;
TpAccountManager *account_mgr;
EmpathyIndividualStore *store;
EmpathyIndividualView *view;
+ GtkWidget *search_entry;
+ GtkWidget *scroll_view;
GPtrArray *search_words;
gchar *search_str;
EmpathyContactChooserFilterFunc filter_func;
gpointer filter_data;
-};
-
-static void
-contact_chooser_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec)
-{
- EmpathyContactChooser *self = (EmpathyContactChooser *)
- object;
- switch (param_id)
- {
- case PROP_TP_CHAT:
- g_value_set_object (value, self->priv->tp_chat);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
- break;
- };
-}
-
-static void
-contact_chooser_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- EmpathyContactChooser *self = (EmpathyContactChooser *)
- object;
-
- switch (param_id)
- {
- case PROP_TP_CHAT:
- g_assert (self->priv->tp_chat == NULL); /* construct-only */
- self->priv->tp_chat = g_value_dup_object (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
- break;
- };
-}
+ /* list of reffed TpContact */
+ GList *tp_contacts;
+};
struct _AddTemporaryIndividualCtx
{
tp_clear_pointer (&self->priv->add_temp_ctx,
add_temporary_individual_ctx_free);
- tp_clear_object (&self->priv->tp_chat);
tp_clear_object (&self->priv->store);
tp_clear_pointer (&self->priv->search_words, g_ptr_array_unref);
tp_clear_pointer (&self->priv->search_str, g_free);
tp_clear_object (&self->priv->account_mgr);
+ g_list_free_full (self->priv->tp_contacts, g_object_unref);
+ self->priv->tp_contacts = NULL;
+
G_OBJECT_CLASS (empathy_contact_chooser_parent_class)->dispose (
object);
}
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->get_property = contact_chooser_get_property;
- object_class->set_property = contact_chooser_set_property;
object_class->dispose = contact_chooser_dispose;
g_type_class_add_private (object_class,
sizeof (EmpathyContactChooserPrivate));
- g_object_class_install_property (object_class,
- PROP_TP_CHAT,
- g_param_spec_object ("tp-chat", "EmpathyTpChat", "EmpathyTpChat",
- EMPATHY_TYPE_TP_CHAT,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
-
signals[SIG_SELECTION_CHANGED] = g_signal_new ("selection-changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ g_cclosure_marshal_generic,
G_TYPE_NONE,
1, FOLKS_TYPE_INDIVIDUAL);
+
+ signals[SIG_ACTIVATE] = g_signal_new ("activate",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE,
+ 0);
}
static void
return display;
}
+static void
+contact_capabilities_changed (TpContact *contact,
+ GParamSpec *pspec,
+ EmpathyContactChooser *self)
+{
+ empathy_individual_view_refilter (self->priv->view);
+}
+
static void
get_contacts_cb (TpConnection *connection,
guint n_contacts,
EmpathyContactChooser *self =
(EmpathyContactChooser *) weak_object;
AddTemporaryIndividualCtx *ctx = user_data;
- TpAccount *account;
- TpfPersonaStore *store;
FolksIndividual *individual;
- TpfPersona *persona_new;
- GeeSet *personas;
+ TpContact *contact;
if (self->priv->add_temp_ctx != ctx)
/* another request has been started */
if (n_contacts != 1)
return;
- account = g_object_get_data (G_OBJECT (connection), "account");
+ contact = contacts[0];
- store = tpf_persona_store_new (account);
- personas = GEE_SET (
- gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref,
- g_direct_hash, g_direct_equal));
- persona_new = tpf_persona_new (contacts[0], store);
- gee_collection_add (GEE_COLLECTION (personas),
- tpf_persona_new (contacts[0], store));
+ individual = empathy_create_individual_from_tp_contact (contact);
+ if (individual == NULL)
+ return;
+
+ /* tp-glib will unref the TpContact once we return from this callback
+ * but folks expect us to keep a reference on the TpContact.
+ * Ideally folks shouldn't force us to do that: bgo #666580 */
+ self->priv->tp_contacts = g_list_prepend (self->priv->tp_contacts,
+ g_object_ref (contact));
- individual = folks_individual_new (personas);
+ /* listen for updates to the capabilities */
+ tp_g_signal_connect_object (contact, "notify::capabilities",
+ G_CALLBACK (contact_capabilities_changed), self, 0);
/* Pass ownership to the list */
ctx->individuals = g_list_prepend (ctx->individuals, individual);
individual_store_add_individual_and_connect (self->priv->store, individual);
- g_clear_object (&persona_new);
- g_clear_object (&personas);
- g_object_unref (store);
+ /* if nothing is selected, select the first matching node */
+ if (!gtk_tree_selection_get_selected (
+ gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->view)),
+ NULL, NULL))
+ empathy_individual_view_select_first (self->priv->view);
}
static void
if (conn == NULL)
continue;
- /* One day we'll have tp_connection_get_account()... */
- g_object_set_data_full (G_OBJECT (conn), "account",
- g_object_ref (account), g_object_unref);
-
tp_connection_get_contacts_by_id (conn, 1, &id, G_N_ELEMENTS (features),
features, get_contacts_cb, self->priv->add_temp_ctx, NULL,
G_OBJECT (self));
empathy_individual_view_refilter (self->priv->view);
}
+static void
+search_activate_cb (GtkEntry *entry,
+ EmpathyContactChooser *self)
+{
+ g_signal_emit (self, signals[SIG_ACTIVATE], 0);
+}
+
+static void
+view_activate_cb (GtkTreeView *view,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ EmpathyContactChooser *self)
+{
+ g_signal_emit (self, signals[SIG_ACTIVATE], 0);
+}
+
+static gboolean
+search_key_press_cb (GtkEntry *entry,
+ GdkEventKey *event,
+ EmpathyContactChooser *self)
+{
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ if (event->state != 0)
+ return FALSE;
+
+ switch (event->keyval)
+ {
+ case GDK_KEY_Down:
+ case GDK_KEY_KP_Down:
+ case GDK_KEY_Up:
+ case GDK_KEY_KP_Up:
+ break;
+
+ default:
+ return FALSE;
+ }
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->view));
+
+ if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+ return TRUE;
+
+ switch (event->keyval)
+ {
+ case GDK_KEY_Down:
+ case GDK_KEY_KP_Down:
+ if (!gtk_tree_model_iter_next (model, &iter))
+ return TRUE;
+
+ break;
+
+ case GDK_KEY_Up:
+ case GDK_KEY_KP_Up:
+ if (!gtk_tree_model_iter_previous (model, &iter))
+ return TRUE;
+
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+
+ gtk_tree_selection_select_iter (selection, &iter);
+
+ return TRUE;
+}
+
static void
empathy_contact_chooser_init (EmpathyContactChooser *self)
{
EmpathyIndividualManager *mgr;
GtkTreeSelection *selection;
- GtkWidget *scroll;
- GtkWidget *search_entry;
GQuark features[] = { TP_ACCOUNT_MANAGER_FEATURE_CORE, 0 };
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_CONTACT_CHOOSER,
tp_proxy_prepare_async (self->priv->account_mgr, features, NULL, NULL);
/* Search entry */
- search_entry = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX (self), search_entry, FALSE, TRUE, 6);
- gtk_widget_show (search_entry);
+ self->priv->search_entry = gtk_entry_new ();
+ gtk_box_pack_start (GTK_BOX (self), self->priv->search_entry, FALSE, TRUE, 6);
+ gtk_widget_show (self->priv->search_entry);
- g_signal_connect (search_entry, "changed",
+ g_signal_connect (self->priv->search_entry, "changed",
G_CALLBACK (search_text_changed), self);
+ g_signal_connect (self->priv->search_entry, "activate",
+ G_CALLBACK (search_activate_cb), self);
+ g_signal_connect (self->priv->search_entry, "key-press-event",
+ G_CALLBACK (search_key_press_cb), self);
/* Add the treeview */
mgr = empathy_individual_manager_dup_singleton ();
- self->priv->store = empathy_individual_store_new (mgr);
+ self->priv->store = EMPATHY_INDIVIDUAL_STORE (
+ empathy_individual_store_manager_new (mgr));
g_object_unref (mgr);
empathy_individual_store_set_show_groups (self->priv->store, FALSE);
g_signal_connect (selection, "changed",
G_CALLBACK (view_selection_changed_cb), self);
+ g_signal_connect (self->priv->view, "row-activated",
+ G_CALLBACK (view_activate_cb), self);
- scroll = gtk_scrolled_window_new (NULL, NULL);
+ self->priv->scroll_view = gtk_scrolled_window_new (NULL, NULL);
- gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (self->priv->view));
+ gtk_container_add (GTK_CONTAINER (self->priv->scroll_view),
+ GTK_WIDGET (self->priv->view));
- gtk_box_pack_start (GTK_BOX (self), scroll, TRUE, TRUE, 6);
+ gtk_box_pack_start (GTK_BOX (self), self->priv->scroll_view, TRUE, TRUE, 6);
gtk_widget_show (GTK_WIDGET (self->priv->view));
- gtk_widget_show (scroll);
+ gtk_widget_show (self->priv->scroll_view);
}
GtkWidget *
-empathy_contact_chooser_new (EmpathyTpChat *tp_chat)
+empathy_contact_chooser_new (void)
{
- g_return_val_if_fail (EMPATHY_IS_TP_CHAT (tp_chat), NULL);
-
return g_object_new (EMPATHY_TYPE_CONTACT_CHOOSER,
"orientation", GTK_ORIENTATION_VERTICAL,
- "tp-chat", tp_chat,
NULL);
}
+/* Note that because of bgo #666580 the returned invidivdual is valid until
+ * @self is destroyed. To keep it around after that, the TpContact associated
+ * with the individual needs to be manually reffed. */
FolksIndividual *
empathy_contact_chooser_dup_selected (EmpathyContactChooser *self)
{
self->priv->filter_func = func;
self->priv->filter_data = user_data;
}
+
+void
+empathy_contact_chooser_show_search_entry (EmpathyContactChooser *self,
+ gboolean show)
+{
+ gtk_widget_set_visible (self->priv->search_entry, show);
+}
+
+void
+empathy_contact_chooser_show_tree_view (EmpathyContactChooser *self,
+ gboolean show)
+{
+ gtk_widget_set_visible (GTK_WIDGET (self->priv->scroll_view), show);
+}
projects / empathy.git / blobdiff