[empathy] contact-list-store: remove EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] contact-list-store: remove EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE
- Date: Mon, 15 Mar 2010 08:31:11 +0000 (UTC)
commit cd054461923a9c8c7d05fab2a5f7a88b9f2e6431
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Mar 9 17:41:37 2010 +0100
contact-list-store: remove EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE
We don't need it any more.
libempathy-gtk/empathy-contact-list-store.c | 35 ---------------------------
libempathy-gtk/empathy-contact-list-store.h | 1 -
2 files changed, 0 insertions(+), 36 deletions(-)
---
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index 1ea5c87..3ebeacb 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -837,7 +837,6 @@ contact_list_store_setup (EmpathyContactListStore *store)
G_TYPE_BOOLEAN, /* Can make audio calls */
G_TYPE_BOOLEAN, /* Can make video calls */
EMPATHY_TYPE_CONTACT_LIST_FLAGS, /* Flags */
- G_TYPE_BOOLEAN, /* Is a favourite */
G_TYPE_BOOLEAN, /* Is a fake group */
};
@@ -932,25 +931,6 @@ contact_list_store_members_changed_cb (EmpathyContactList *list_iface,
}
static void
-contact_list_store_change_contact_favourite_status (EmpathyContactListStore *store,
- EmpathyContact *contact,
- gboolean is_favourite)
-{
- GList *iters, *l;
-
- iters = contact_list_store_find_contact (store, contact);
- for (l = iters; l; l = l->next) {
- gtk_tree_store_set (GTK_TREE_STORE (store), l->data,
- EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE,
- is_favourite,
- -1);
- }
-
- g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
- g_list_free (iters);
-}
-
-static void
contact_list_store_favourites_changed_cb (EmpathyContactList *list_iface,
EmpathyContact *contact,
gboolean is_favourite,
@@ -965,9 +945,6 @@ contact_list_store_favourites_changed_cb (EmpathyContactList *list_iface,
empathy_contact_get_handle (contact),
is_favourite ? "now" : "no longer");
- contact_list_store_change_contact_favourite_status (store, contact,
- is_favourite);
-
contact_list_store_remove_contact (store, contact);
contact_list_store_add_contact (store, contact);
}
@@ -1175,17 +1152,6 @@ contact_list_store_remove_contact (EmpathyContactListStore *store,
g_list_free (iters);
}
-static gboolean
-list_store_contact_is_favourite (EmpathyContactListStore *store,
- EmpathyContact *contact)
-{
- EmpathyContactListStorePriv *priv;
-
- priv = GET_PRIV (store);
-
- return empathy_contact_list_is_favourite (priv->list, contact);
-}
-
static void
contact_list_store_contact_update (EmpathyContactListStore *store,
EmpathyContact *contact)
@@ -1301,7 +1267,6 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
pixbuf_status = contact_list_store_get_contact_status_icon (store, contact);
for (l = iters; l && set_model; l = l->next) {
gtk_tree_store_set (GTK_TREE_STORE (store), l->data,
- EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE, list_store_contact_is_favourite (store, contact),
EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, pixbuf_status,
EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR, pixbuf_avatar,
EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar,
diff --git a/libempathy-gtk/empathy-contact-list-store.h b/libempathy-gtk/empathy-contact-list-store.h
index ec8aa3a..a787b83 100644
--- a/libempathy-gtk/empathy-contact-list-store.h
+++ b/libempathy-gtk/empathy-contact-list-store.h
@@ -63,7 +63,6 @@ typedef enum {
EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
EMPATHY_CONTACT_LIST_STORE_COL_FLAGS,
- EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE,
EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP,
EMPATHY_CONTACT_LIST_STORE_COL_COUNT,
} EmpathyContactListStoreCol;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]