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,
"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),
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_destroy (priv->empathy_contact_cache);
- g_hash_table_destroy (priv->empathy_group_cache);
+ 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);
}
}
}
-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,
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);
}
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);
}
}
}
-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 */