diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-31 16:49:01 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-31 16:49:01 +0800 |
| commit | 77f461b861167a019ced300be89b169e787bb9ad (patch) | |
| tree | aa263c103e19536314a19da70f79a843c11ce8b0 | |
| parent | fb4dd0e753b8ff6fa717096edcacab43ee2a56f2 (diff) | |
| download | gsoc2013-empathy-77f461b861167a019ced300be89b169e787bb9ad.tar gsoc2013-empathy-77f461b861167a019ced300be89b169e787bb9ad.tar.gz gsoc2013-empathy-77f461b861167a019ced300be89b169e787bb9ad.tar.bz2 gsoc2013-empathy-77f461b861167a019ced300be89b169e787bb9ad.tar.lz gsoc2013-empathy-77f461b861167a019ced300be89b169e787bb9ad.tar.xz gsoc2013-empathy-77f461b861167a019ced300be89b169e787bb9ad.tar.zst gsoc2013-empathy-77f461b861167a019ced300be89b169e787bb9ad.zip | |
Always use fake groups (#614375)
There is no reason to use them when favourite contacts are enabled any more.
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-store.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c index 6b35b0824..4ff138279 100644 --- a/libempathy-gtk/empathy-contact-list-store.c +++ b/libempathy-gtk/empathy-contact-list-store.c @@ -1060,7 +1060,6 @@ contact_list_store_add_contact (EmpathyContactListStore *store, tp_connection_parse_object_path (connection, &protocol_name, NULL); if (!groups) { -#if HAVE_FAVOURITE_CONTACTS GtkTreeIter iter_group; if (!tp_strdiff (protocol_name, "local-xmpp")) { @@ -1076,28 +1075,6 @@ contact_list_store_add_contact (EmpathyContactListStore *store, gtk_tree_store_insert_after (GTK_TREE_STORE (store), &iter, &iter_group, NULL); -#else - /* FIXME: remove this in 2.31.x */ - /* If no groups just add it at the top level. */ - GtkTreeModel *model = GTK_TREE_MODEL (store); - - if (gtk_tree_model_get_iter_first (model, &iter)) do { - EmpathyContact *c; - - gtk_tree_model_get (model, &iter, - EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &c, - -1); - - if (c == contact) { - g_object_unref (c); - return; - } - if (c != NULL) - g_object_unref (c); - } while (gtk_tree_model_iter_next (model, &iter)); - - gtk_tree_store_append (GTK_TREE_STORE (store), &iter, NULL); -#endif add_contact_to_store (GTK_TREE_STORE (store), &iter, contact, flags); } |