guint setup_idle_id;
gboolean dispose_has_run;
GHashTable *status_icons;
+ /* Hash: EmpathyContact* -> GQueue (GtkTreeIter *) */
+ GHashTable *empathy_contact_cache;
+ /* Hash: char *groupname -> GtkTreeIter * */
+ GHashTable *empathy_group_cache;
} EmpathyContactListStorePriv;
-typedef struct {
- GtkTreeIter iter;
- const gchar *name;
- gboolean found;
-} FindGroup;
-
-typedef struct {
- EmpathyContact *contact;
- gboolean found;
- GList *iters;
-} FindContact;
-
typedef struct {
EmpathyContactListStore *store;
EmpathyContact *contact;
gboolean remove;
+ guint timeout;
} ShowActiveData;
static void contact_list_store_dispose (GObject *object);
gchar *message,
gboolean is_member,
EmpathyContactListStore *store);
-static void contact_list_store_favourites_changed_cb (EmpathyContactList *list_iface,
- EmpathyContact *contact,
- gboolean is_favourite,
- EmpathyContactListStore *store);
static void contact_list_store_member_renamed_cb (EmpathyContactList *list_iface,
EmpathyContact *old_contact,
EmpathyContact *new_contact,
gboolean remove);
static void contact_list_store_contact_active_free (ShowActiveData *data);
static gboolean contact_list_store_contact_active_cb (ShowActiveData *data);
-static gboolean contact_list_store_get_group_foreach (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- FindGroup *fg);
static void contact_list_store_get_group (EmpathyContactListStore *store,
const gchar *name,
GtkTreeIter *iter_group_to_set,
GtkTreeIter *iter_a,
GtkTreeIter *iter_b,
gpointer user_data);
-static gboolean contact_list_store_find_contact_foreach (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- FindContact *fc);
static GList * contact_list_store_find_contact (EmpathyContactListStore *store,
EmpathyContact *contact);
static gboolean contact_list_store_update_list_mode_foreach (GtkTreeModel *model,
"members-changed",
G_CALLBACK (contact_list_store_members_changed_cb),
store);
- g_signal_connect (priv->list,
- "favourites-changed",
- G_CALLBACK (contact_list_store_favourites_changed_cb),
- store);
g_signal_connect (priv->list,
"groups-changed",
G_CALLBACK (contact_list_store_groups_changed_cb),
store);
if (EMPATHY_IS_TP_CHAT (priv->list)) {
- TpChannel *channel;
-
- channel = empathy_tp_chat_get_channel (EMPATHY_TP_CHAT (priv->list));
- if (!tp_proxy_is_prepared (channel, TP_CHANNEL_FEATURE_CHAT_STATES)) {
- DEBUG ("Chat state feature not prepared");
- } else {
- g_signal_connect (channel,
+ g_signal_connect (priv->list,
"chat-state-changed",
G_CALLBACK (contact_list_store_chat_state_changed_cb),
store);
- }
}
/* Add contacts already created. */
g_type_class_add_private (object_class, sizeof (EmpathyContactListStorePriv));
}
+static void
+g_queue_free_full_iter (gpointer data)
+{
+ GQueue *queue = (GQueue *) data;
+ g_queue_foreach (queue, (GFunc) gtk_tree_iter_free, NULL);
+ g_queue_free (queue);
+}
+
+
static void
empathy_contact_list_store_init (EmpathyContactListStore *store)
{
(GSourceFunc) contact_list_store_inibit_active_cb,
store);
priv->status_icons = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+ priv->empathy_contact_cache = g_hash_table_new_full (NULL, NULL, NULL,
+ g_queue_free_full_iter);
+ priv->empathy_group_cache = g_hash_table_new_full (g_str_hash,
+ g_str_equal, g_free,
+ (GDestroyNotify) gtk_tree_iter_free);
contact_list_store_setup (store);
}
g_signal_handlers_disconnect_by_func (priv->list,
G_CALLBACK (contact_list_store_members_changed_cb),
object);
- g_signal_handlers_disconnect_by_func (priv->list,
- G_CALLBACK (contact_list_store_favourites_changed_cb),
- object);
g_signal_handlers_disconnect_by_func (priv->list,
G_CALLBACK (contact_list_store_groups_changed_cb),
object);
g_object_unref (priv->list);
- if (priv->inhibit_active) {
+ if (priv->inhibit_active != 0) {
g_source_remove (priv->inhibit_active);
+ priv->inhibit_active = 0;
}
if (priv->setup_idle_id != 0) {
g_source_remove (priv->setup_idle_id);
+ priv->setup_idle_id = 0;
}
- g_hash_table_destroy (priv->status_icons);
+ g_hash_table_unref (priv->status_icons);
+ g_hash_table_unref (priv->empathy_contact_cache);
+ g_hash_table_unref (priv->empathy_group_cache);
G_OBJECT_CLASS (empathy_contact_list_store_parent_class)->dispose (object);
}
GList *contacts, *l;
gtk_tree_store_clear (GTK_TREE_STORE (store));
+
+ /* Also clear the cache */
+ g_hash_table_remove_all (priv->empathy_contact_cache);
+ g_hash_table_remove_all (priv->empathy_group_cache);
+
contacts = empathy_contact_list_get_members (priv->list);
for (l = contacts; l; l = l->next) {
contact_list_store_members_changed_cb (priv->list,
}
}
-static void
-contact_list_store_favourites_changed_cb (EmpathyContactList *list_iface,
- EmpathyContact *contact,
- gboolean is_favourite,
- EmpathyContactListStore *store)
-{
- DEBUG ("Contact %s (%d) is %s a favourite",
- empathy_contact_get_id (contact),
- empathy_contact_get_handle (contact),
- is_favourite ? "now" : "no longer");
-
- contact_list_store_remove_contact (store, contact);
- contact_list_store_add_contact (store, contact);
-}
-
static void
contact_list_store_member_renamed_cb (EmpathyContactList *list_iface,
EmpathyContact *old_contact,
EmpathyContact *contact,
EmpathyContactListFlags flags)
{
+ EmpathyContactListStorePriv *priv = GET_PRIV (store);
+ GQueue *queue;
+
gtk_tree_store_insert_with_values (store, iter, parent, 0,
EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_alias (contact),
EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
EMPATHY_CAPABILITIES_VIDEO,
EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
-1);
+
+ queue = g_hash_table_lookup (priv->empathy_contact_cache, contact);
+ if (queue) {
+ g_queue_push_tail (queue, gtk_tree_iter_copy (iter));
+ } else {
+ queue = g_queue_new ();
+ g_queue_push_tail (queue, gtk_tree_iter_copy (iter));
+ g_hash_table_insert (priv->empathy_contact_cache, contact,
+ queue);
+ }
}
static void
if (!priv->show_groups) {
parent = NULL;
- } else if (!tp_strdiff (protocol_name, "local-xmpp")) {
- /* these are People Nearby */
- contact_list_store_get_group (store,
- EMPATHY_CONTACT_LIST_STORE_PEOPLE_NEARBY,
- &iter_group, NULL, NULL, TRUE);
- } else {
- contact_list_store_get_group (store,
- EMPATHY_CONTACT_LIST_STORE_UNGROUPED,
- &iter_group, NULL, NULL, TRUE);
}
add_contact_to_store (GTK_TREE_STORE (store), &iter, parent,
}
g_list_free (groups);
- if (priv->show_groups &&
- empathy_contact_list_is_favourite (priv->list, contact)) {
- /* Add contact to the fake 'Favorites' group */
- GtkTreeIter iter_group;
-
- contact_list_store_get_group (store, EMPATHY_CONTACT_LIST_STORE_FAVORITE,
- &iter_group, NULL, NULL, TRUE);
-
- add_contact_to_store (GTK_TREE_STORE (store), &iter, &iter_group, contact, flags);
- }
-
contact_list_store_contact_update (store, contact);
}
contact_list_store_remove_contact (EmpathyContactListStore *store,
EmpathyContact *contact)
{
+ EmpathyContactListStorePriv *priv = GET_PRIV (store);
GtkTreeModel *model;
- GList *iters, *l;
+ GList *l;
+ GQueue *row_refs;
- iters = contact_list_store_find_contact (store, contact);
- if (!iters) {
+ row_refs = g_hash_table_lookup (priv->empathy_contact_cache, contact);
+ if (!row_refs) {
return;
}
/* Clean up model */
model = GTK_TREE_MODEL (store);
- for (l = iters; l; l = l->next) {
+ for (l = g_queue_peek_head_link (row_refs); l; l = l->next) {
+ GtkTreeIter *iter = l->data;
GtkTreeIter parent;
/* NOTE: it is only <= 2 here because we have
* separators after the group name, otherwise it
* should be 1.
*/
- if (gtk_tree_model_iter_parent (model, &parent, l->data) &&
+ if (gtk_tree_model_iter_parent (model, &parent, iter) &&
gtk_tree_model_iter_n_children (model, &parent) <= 2) {
+ gchar *group_name;
+ gtk_tree_model_get (model, &parent,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, &group_name,
+ -1);
+ g_hash_table_remove (priv->empathy_group_cache,
+ group_name);
gtk_tree_store_remove (GTK_TREE_STORE (store), &parent);
} else {
- gtk_tree_store_remove (GTK_TREE_STORE (store), l->data);
+ gtk_tree_store_remove (GTK_TREE_STORE (store), iter);
}
}
- g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
- g_list_free (iters);
+ g_hash_table_remove (priv->empathy_contact_cache, contact);
}
static void
if (do_set_active) {
data = contact_list_store_contact_active_new (store, contact, do_remove);
- g_timeout_add_seconds (ACTIVE_USER_SHOW_TIME,
+ data->timeout = g_timeout_add_seconds (ACTIVE_USER_SHOW_TIME,
(GSourceFunc) contact_list_store_contact_active_cb,
data);
}
}
+static void
+store_contact_active_invalidated (ShowActiveData *data,
+ GObject *old_object)
+{
+ /* Remove the timeout and free the struct, since the contact or contact
+ * store has disappeared. */
+ g_source_remove (data->timeout);
+
+ if (old_object == (GObject *) data->store)
+ data->store = NULL;
+ else if (old_object == (GObject *) data->contact)
+ data->contact = NULL;
+ else
+ g_assert_not_reached ();
+
+ contact_list_store_contact_active_free (data);
+}
+
static ShowActiveData *
contact_list_store_contact_active_new (EmpathyContactListStore *store,
EmpathyContact *contact,
data = g_slice_new0 (ShowActiveData);
- data->store = g_object_ref (store);
- data->contact = g_object_ref (contact);
+ /* We don't actually want to force either the IndividualStore or the
+ * Individual to stay alive, since the user could quit Empathy or disable
+ * the account before the contact_active timeout is fired. */
+ g_object_weak_ref (G_OBJECT (store),
+ (GWeakNotify) store_contact_active_invalidated, data);
+ g_object_weak_ref (G_OBJECT (contact),
+ (GWeakNotify) store_contact_active_invalidated, data);
+
+ data->store = store;
+ data->contact = contact;
data->remove = remove_;
+ data->timeout = 0;
return data;
}
static void
contact_list_store_contact_active_free (ShowActiveData *data)
{
- g_object_unref (data->contact);
- g_object_unref (data->store);
+ if (data->store != NULL)
+ g_object_weak_unref (G_OBJECT (data->store),
+ (GWeakNotify) store_contact_active_invalidated, data);
+
+ if (data->contact != NULL)
+ g_object_weak_unref (G_OBJECT (data->contact),
+ (GWeakNotify) store_contact_active_invalidated, data);
g_slice_free (ShowActiveData, data);
}
return FALSE;
}
-static gboolean
-contact_list_store_get_group_foreach (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- FindGroup *fg)
-{
- gchar *str;
- gboolean is_group;
-
- /* Groups are only at the top level. */
- if (gtk_tree_path_get_depth (path) != 1) {
- return FALSE;
- }
-
- gtk_tree_model_get (model, iter,
- EMPATHY_CONTACT_LIST_STORE_COL_NAME, &str,
- EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
- -1);
-
- if (is_group && !tp_strdiff (str, fg->name)) {
- fg->found = TRUE;
- fg->iter = *iter;
- }
-
- g_free (str);
-
- return fg->found;
-}
-
static void
contact_list_store_get_group (EmpathyContactListStore *store,
const gchar *name,
gboolean *created,
gboolean is_fake_group)
{
+ EmpathyContactListStorePriv *priv = GET_PRIV (store);
GtkTreeModel *model;
GtkTreeIter iter_group;
GtkTreeIter iter_separator;
- FindGroup fg;
-
- memset (&fg, 0, sizeof (fg));
-
- fg.name = name;
+ GtkTreeIter *iter;
model = GTK_TREE_MODEL (store);
- gtk_tree_model_foreach (model,
- (GtkTreeModelForeachFunc) contact_list_store_get_group_foreach,
- &fg);
+ iter = g_hash_table_lookup (priv->empathy_group_cache, name);
- if (!fg.found) {
+ if (iter == NULL) {
if (created) {
*created = TRUE;
}
EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, is_fake_group,
-1);
+ g_hash_table_insert (priv->empathy_group_cache,
+ g_strdup (name), gtk_tree_iter_copy (&iter_group));
+
if (iter_group_to_set) {
*iter_group_to_set = iter_group;
}
}
if (iter_group_to_set) {
- *iter_group_to_set = fg.iter;
+ *iter_group_to_set = *iter;
}
- iter_separator = fg.iter;
+ iter_separator = *iter;
if (gtk_tree_model_iter_next (model, &iter_separator)) {
gboolean is_separator;
}
}
-static gint
-get_position (const char **strv,
- const char *str)
-{
- int i;
-
- for (i = 0; strv[i] != NULL; i++) {
- if (!tp_strdiff (strv[i], str))
- return i;
- }
-
- return -1;
-}
-
static gint
compare_separator_and_groups (gboolean is_separator_a,
gboolean is_separator_b,
gboolean fake_group_a,
gboolean fake_group_b)
{
- /* these two lists are the sorted list of fake groups to include at the
- * top and bottom of the roster */
- const char *top_groups[] = {
- EMPATHY_CONTACT_LIST_STORE_FAVORITE,
- NULL
- };
-
- const char *bottom_groups[] = {
- EMPATHY_CONTACT_LIST_STORE_UNGROUPED,
- NULL
- };
-
if (is_separator_a || is_separator_b) {
/* We have at least one separator */
if (is_separator_a) {
} else if (contact_a && !contact_b) {
return -1;
} else if (!contact_a && !contact_b) {
- gboolean a_in_top, b_in_top, a_in_bottom, b_in_bottom;
-
- a_in_top = fake_group_a &&
- tp_strv_contains (top_groups, name_a);
- b_in_top = fake_group_b &&
- tp_strv_contains (top_groups, name_b);
- a_in_bottom = fake_group_a &&
- tp_strv_contains (bottom_groups, name_a);
- b_in_bottom = fake_group_b &&
- tp_strv_contains (bottom_groups, name_b);
-
- if (a_in_top && b_in_top) {
- /* compare positions */
- return CLAMP (get_position (top_groups, name_a) -
- get_position (top_groups, name_b),
- -1, 1);
- } else if (a_in_bottom && b_in_bottom) {
- /* compare positions */
- return CLAMP (get_position (bottom_groups, name_a) -
- get_position (bottom_groups, name_b),
- -1, 1);
- } else if (a_in_top || b_in_bottom) {
- return -1;
- } else if (b_in_top || a_in_bottom) {
- return 1;
- } else {
- return g_utf8_collate (name_a, name_b);
- }
+ return g_utf8_collate (name_a, name_b);
}
/* Two contacts, ordering depends of the sorting policy */
return ret_val;
}
-static gboolean
-contact_list_store_find_contact_foreach (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- FindContact *fc)
-{
- EmpathyContact *contact;
-
- gtk_tree_model_get (model, iter,
- EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
- -1);
-
- if (contact == fc->contact) {
- fc->found = TRUE;
- fc->iters = g_list_append (fc->iters, gtk_tree_iter_copy (iter));
- }
-
- if (contact) {
- g_object_unref (contact);
- }
-
- return FALSE;
-}
-
static GList *
contact_list_store_find_contact (EmpathyContactListStore *store,
EmpathyContact *contact)
{
- GtkTreeModel *model;
- GList *l = NULL;
- FindContact fc;
-
- memset (&fc, 0, sizeof (fc));
+ EmpathyContactListStorePriv *priv = GET_PRIV (store);
+ GQueue *row_refs_queue;
+ GList *i;
+ GList *iters_list = NULL;
- fc.contact = contact;
+ row_refs_queue = g_hash_table_lookup (priv->empathy_contact_cache, contact);
+ if (!row_refs_queue)
+ return NULL;
- model = GTK_TREE_MODEL (store);
- gtk_tree_model_foreach (model,
- (GtkTreeModelForeachFunc) contact_list_store_find_contact_foreach,
- &fc);
+ for (i = g_queue_peek_head_link (row_refs_queue) ; i != NULL ;
+ i = i->next) {
+ GtkTreeIter *iter = i->data;
- if (fc.found) {
- l = fc.iters;
+ iters_list = g_list_prepend
+ (iters_list, gtk_tree_iter_copy (iter));
}
- return l;
+ return iters_list;
}
static gboolean
projects / empathy.git / blobdiff