*
* Authors: Xavier Claessens <xclaesse@gmail.com>
* Authors: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+ * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
#include <config.h>
#include "empathy-contact-selector-dialog.h"
#include "empathy-account-chooser.h"
-G_DEFINE_TYPE(EmpathyContactSelectorDialog, empathy_contact_selector_dialog,
+G_DEFINE_ABSTRACT_TYPE (EmpathyContactSelectorDialog,
+ empathy_contact_selector_dialog,
GTK_TYPE_DIALOG)
typedef struct _EmpathyContactSelectorDialogPriv \
EmpathyContactSelectorDialogPriv;
struct _EmpathyContactSelectorDialogPriv {
+ GtkListStore *store;
+ GtkWidget *account_chooser_label;
GtkWidget *account_chooser;
GtkWidget *entry_id;
EmpathyContactManager *contact_manager;
+ TpAccount *filter_account;
+
+ gboolean show_account_chooser;
};
#define GET_PRIV(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG, \
EmpathyContactSelectorDialogPriv))
+enum {
+ PROP_0,
+ PROP_SHOW_ACCOUNT_CHOOSER,
+ PROP_FILTER_ACCOUNT
+};
+
enum {
COMPLETION_COL_TEXT,
COMPLETION_COL_ID,
EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
EmpathyAccountChooser *chooser;
TpConnection *connection;
- EmpathyTpContactList *contact_list;
GList *members;
- GtkListStore *store;
- GtkEntryCompletion *completion;
- GtkTreeIter iter;
- gchar *tmpstr;
/* Remove completions */
- completion = gtk_entry_get_completion (GTK_ENTRY (priv->entry_id));
- store = GTK_LIST_STORE (gtk_entry_completion_get_model (completion));
- gtk_list_store_clear (store);
+ gtk_list_store_clear (priv->store);
/* Get members of the new account */
chooser = EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser);
if (!connection)
return;
- contact_list = empathy_contact_manager_get_list (priv->contact_manager,
- connection);
- members = empathy_contact_list_get_members (
- EMPATHY_CONTACT_LIST (contact_list));
+ if (priv->show_account_chooser)
+ {
+ EmpathyTpContactList *contact_list;
+
+ contact_list = empathy_contact_manager_get_list (priv->contact_manager,
+ connection);
+ members = empathy_contact_list_get_members (
+ EMPATHY_CONTACT_LIST (contact_list));
+ }
+ else
+ {
+ if (priv->filter_account != NULL)
+ {
+ EmpathyTpContactList *contact_list;
+
+ connection = tp_account_get_connection (priv->filter_account);
+ if (connection == NULL)
+ return;
+
+ contact_list = empathy_contact_manager_get_list (
+ priv->contact_manager, connection);
+
+ members = empathy_contact_list_get_members (
+ EMPATHY_CONTACT_LIST (contact_list));
+ }
+ else
+ {
+ members = empathy_contact_list_get_members (
+ EMPATHY_CONTACT_LIST (priv->contact_manager));
+ }
+ }
/* Add members to the completion */
while (members)
{
EmpathyContact *contact = members->data;
+ GtkTreeIter iter;
+ gchar *tmpstr;
DEBUG ("Adding contact ID %s, Name %s",
empathy_contact_get_id (contact),
- empathy_contact_get_name (contact));
+ empathy_contact_get_alias (contact));
tmpstr = g_strdup_printf ("%s (%s)",
- empathy_contact_get_name (contact),
+ empathy_contact_get_alias (contact),
empathy_contact_get_id (contact));
- gtk_list_store_insert_with_values (store, &iter, -1,
+ gtk_list_store_insert_with_values (priv->store, &iter, -1,
COMPLETION_COL_TEXT, tmpstr,
COMPLETION_COL_ID, empathy_contact_get_id (contact),
- COMPLETION_COL_NAME, empathy_contact_get_name (contact),
+ COMPLETION_COL_NAME, empathy_contact_get_alias (contact),
-1);
g_free (tmpstr);
gpointer user_data)
{
GtkTreeModel *model;
- gchar *id;
- gchar *name;
+ gchar *str, *lower;
+ gboolean v = FALSE;
model = gtk_entry_completion_get_model (completion);
if (!model || !iter)
return FALSE;
- gtk_tree_model_get (model, iter, COMPLETION_COL_NAME, &name, -1);
- if (strstr (name, key))
+ gtk_tree_model_get (model, iter, COMPLETION_COL_NAME, &str, -1);
+ lower = g_utf8_strdown (str, -1);
+ if (strstr (lower, key))
{
- DEBUG ("Key %s is matching name **%s**", key, name);
- g_free (name);
- return TRUE;
+ DEBUG ("Key %s is matching name **%s**", key, str);
+ v = TRUE;
+ goto out;
}
- g_free (name);
+ g_free (str);
+ g_free (lower);
- gtk_tree_model_get (model, iter, COMPLETION_COL_ID, &id, -1);
- if (strstr (id, key))
+ gtk_tree_model_get (model, iter, COMPLETION_COL_ID, &str, -1);
+ lower = g_utf8_strdown (str, -1);
+ if (strstr (lower, key))
{
- DEBUG ("Key %s is matching ID **%s**", key, id);
- g_free (id);
- return TRUE;
+ DEBUG ("Key %s is matching ID **%s**", key, str);
+ v = TRUE;
+ goto out;
}
- g_free (id);
- return FALSE;
-}
-
-static void
-contact_selector_dialog_response_cb (GtkWidget *widget,
- gint response,
- EmpathyContactSelectorDialog *dialog)
-{
- EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
- TpConnection *connection;
- const gchar *id;
- EmpathyContactSelectorDialogClass *class = \
- EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (dialog);
-
- connection = empathy_account_chooser_get_connection (
- EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser));
- id = gtk_entry_get_text (GTK_ENTRY (priv->entry_id));
- if (!connection || EMP_STR_EMPTY (id))
- {
- gtk_widget_destroy (widget);
- return;
- }
-
- if (response == GTK_RESPONSE_ACCEPT)
- {
- class->got_response (dialog, connection, id);
- }
+out:
+ g_free (str);
+ g_free (lower);
- gtk_widget_destroy (widget);
+ return v;
}
static void
gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_ACCEPT);
}
+static void
+account_chooser_filter (TpAccount *account,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
+ gpointer user_data)
+{
+ EmpathyContactSelectorDialog *self = user_data;
+ EmpathyContactSelectorDialogClass *class = \
+ EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (self);
+
+ if (class->account_filter == NULL)
+ {
+ empathy_account_chooser_filter_is_connected (
+ account,callback, callback_data, user_data);
+ return;
+ }
+
+ class->account_filter (self, callback, callback_data, account);
+}
+
+static gboolean
+contact_selector_dialog_filter_visible (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ EmpathyContactSelectorDialog *self = EMPATHY_CONTACT_SELECTOR_DIALOG (data);
+ gboolean r;
+ char *id;
+
+ gtk_tree_model_get (model, iter,
+ COMPLETION_COL_ID, &id,
+ -1);
+
+ /* this must be non-NULL for this function to get called */
+ r = EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (self)->contact_filter (
+ self, id);
+
+ g_free (id);
+
+ return r;
+}
+
static void
empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog)
{
GtkBuilder *gui;
gchar *filename;
GtkEntryCompletion *completion;
- GtkListStore *model;
GtkWidget *content_area;
+ GtkWidget *table_contact;
+
+ dialog->vbox = gtk_vbox_new (FALSE, 3);
/* create a contact manager */
priv->contact_manager = empathy_contact_manager_dup_singleton ();
filename = empathy_file_lookup ("empathy-contact-selector-dialog.ui",
"libempathy-gtk");
gui = empathy_builder_get_file (filename,
- "table_contact", &dialog->table_contact,
+ "table_contact", &table_contact,
+ "account_chooser_label", &priv->account_chooser_label,
"entry_id", &priv->entry_id,
NULL);
g_free (filename);
NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
- gtk_container_add (GTK_CONTAINER (content_area), dialog->table_contact);
+ gtk_container_add (GTK_CONTAINER (content_area), dialog->vbox);
+ gtk_box_pack_start (GTK_BOX (dialog->vbox), table_contact, TRUE, TRUE, 0);
+ gtk_widget_show (dialog->vbox);
gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
/* Tweak the dialog */
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
+
/* text completion */
+ priv->store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+
completion = gtk_entry_completion_new ();
- model = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
gtk_entry_completion_set_text_column (completion, COMPLETION_COL_TEXT);
gtk_entry_completion_set_match_func (completion,
contact_selector_dialog_match_func,
NULL, NULL);
- gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (model));
+ gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (priv->store));
gtk_entry_set_completion (GTK_ENTRY (priv->entry_id), completion);
g_signal_connect (completion, "match-selected",
G_CALLBACK (contact_selector_dialog_match_selected_cb),
dialog);
g_object_unref (completion);
- g_object_unref (model);
-
- g_signal_connect (dialog, "response",
- G_CALLBACK (contact_selector_dialog_response_cb), dialog);
+ g_object_unref (priv->store);
empathy_builder_connect (gui, dialog,
"entry_id", "changed", contact_selector_change_state_button_cb,
g_object_unref (gui);
/* Create account chooser */
+ priv->show_account_chooser = TRUE;
priv->account_chooser = empathy_account_chooser_new ();
- gtk_table_attach_defaults (GTK_TABLE (dialog->table_contact),
+ gtk_table_attach_defaults (GTK_TABLE (table_contact),
priv->account_chooser,
1, 2, 0, 1);
empathy_account_chooser_set_filter (
EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser),
- empathy_account_chooser_filter_is_connected,
- NULL);
+ account_chooser_filter,
+ dialog);
gtk_widget_show (priv->account_chooser);
contact_selector_dialog_account_changed_cb (priv->account_chooser, dialog);
dialog);
}
+static void
+empathy_contact_selector_dialog_get_property (GObject *self,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyContactSelectorDialog *dialog = EMPATHY_CONTACT_SELECTOR_DIALOG (self);
+
+ switch (prop_id)
+ {
+ case PROP_SHOW_ACCOUNT_CHOOSER:
+ g_value_set_boolean (value,
+ empathy_contact_selector_dialog_get_show_account_chooser (dialog));
+ break;
+
+ case PROP_FILTER_ACCOUNT:
+ g_value_set_object (value,
+ empathy_contact_selector_dialog_get_filter_account (dialog));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (self, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+empathy_contact_selector_dialog_set_property (GObject *self,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyContactSelectorDialog *dialog = EMPATHY_CONTACT_SELECTOR_DIALOG (self);
+
+ switch (prop_id)
+ {
+ case PROP_SHOW_ACCOUNT_CHOOSER:
+ empathy_contact_selector_dialog_set_show_account_chooser (dialog,
+ g_value_get_boolean (value));
+ break;
+
+ case PROP_FILTER_ACCOUNT:
+ empathy_contact_selector_dialog_set_filter_account (dialog,
+ g_value_get_object (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (self, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+empathy_contact_selector_dialog_constructed (GObject *dialog)
+{
+ EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
+
+ if (EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (dialog)->contact_filter)
+ {
+ GtkEntryCompletion *completion;
+ GtkTreeModel *filter;
+
+ completion = gtk_entry_get_completion (GTK_ENTRY (priv->entry_id));
+ filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (priv->store), NULL);
+
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter),
+ contact_selector_dialog_filter_visible, dialog, NULL);
+
+ gtk_entry_completion_set_model (completion, filter);
+ g_object_unref (filter);
+ }
+}
+
static void
empathy_contact_selector_dialog_dispose (GObject *object)
{
priv->contact_manager = NULL;
}
+ if (priv->filter_account != NULL) {
+ g_object_unref (priv->filter_account);
+ priv->filter_account = NULL;
+ }
+
if (G_OBJECT_CLASS (empathy_contact_selector_dialog_parent_class)->dispose)
G_OBJECT_CLASS (empathy_contact_selector_dialog_parent_class)->dispose (
object);
g_type_class_add_private (class, sizeof (EmpathyContactSelectorDialogPriv));
+ class->contact_filter = NULL;
+
+ object_class->constructed = empathy_contact_selector_dialog_constructed;
object_class->dispose = empathy_contact_selector_dialog_dispose;
+ object_class->get_property = empathy_contact_selector_dialog_get_property;
+ object_class->set_property = empathy_contact_selector_dialog_set_property;
+
+ g_object_class_install_property (object_class, PROP_SHOW_ACCOUNT_CHOOSER,
+ g_param_spec_boolean ("show-account-chooser",
+ "Show Account Chooser",
+ "Whether or not this dialog should show an account chooser",
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_FILTER_ACCOUNT,
+ g_param_spec_object ("filter-account",
+ "Account to filter contacts",
+ "if 'show-account-chooser' is unset, only the contacts from this "
+ "account are displayed",
+ TP_TYPE_ACCOUNT,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}
+
+const gchar *
+empathy_contact_selector_dialog_get_selected (
+ EmpathyContactSelectorDialog *self,
+ TpConnection **connection,
+ TpAccount **account)
+{
+ EmpathyContactSelectorDialogPriv *priv;
+ const char *id;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self), NULL);
+
+ priv = GET_PRIV (self);
+
+ if (connection != NULL)
+ {
+ if (priv->show_account_chooser)
+ *connection = empathy_account_chooser_get_connection (
+ EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser));
+ else
+ *connection = NULL;
+ }
+
+ if (account != NULL)
+ {
+ if (priv->show_account_chooser)
+ *account = empathy_account_chooser_get_account (
+ EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser));
+ else
+ *account = NULL;
+ }
+
+
+ id = gtk_entry_get_text (GTK_ENTRY (priv->entry_id));
+ return id;
+}
+
+void
+empathy_contact_selector_dialog_set_show_account_chooser (
+ EmpathyContactSelectorDialog *self,
+ gboolean show_account_chooser)
+{
+ EmpathyContactSelectorDialogPriv *priv;
+
+ g_return_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self));
+
+ priv = GET_PRIV (self);
+ priv->show_account_chooser = show_account_chooser;
+
+ gtk_widget_set_visible (priv->account_chooser_label, show_account_chooser);
+ gtk_widget_set_visible (priv->account_chooser, show_account_chooser);
+ contact_selector_dialog_account_changed_cb (priv->account_chooser, self);
+
+ g_object_notify (G_OBJECT (self), "show-account-chooser");
+}
+
+gboolean
+empathy_contact_selector_dialog_get_show_account_chooser (
+ EmpathyContactSelectorDialog *self)
+{
+ EmpathyContactSelectorDialogPriv *priv;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self), FALSE);
+
+ priv = GET_PRIV (self);
+ return priv->show_account_chooser;
+}
+
+void
+empathy_contact_selector_dialog_set_filter_account (
+ EmpathyContactSelectorDialog *self,
+ TpAccount *account)
+{
+ EmpathyContactSelectorDialogPriv *priv;
+
+ g_return_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self));
+
+ priv = GET_PRIV (self);
+ priv->filter_account = g_object_ref (account);
+
+ g_object_notify (G_OBJECT (self), "filter-account");
+}
+
+TpAccount *
+empathy_contact_selector_dialog_get_filter_account (
+ EmpathyContactSelectorDialog *self)
+{
+ EmpathyContactSelectorDialogPriv *priv;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self), NULL);
+
+ priv = GET_PRIV (self);
+ return priv->filter_account;
+
}
projects / empathy.git / blobdiff