remove 'favorite' column in the contact list

We can use the contact menu now.

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 8fb08dfdc02811007877dce50e71b814406b308c..705494e4ada377351ff601cbd5b8a930dabda91d 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -34,7 +34,6 @@
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/util.h>
 
-#include <extensions/extensions.h>
 #include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-contact-list.h>
@@ -817,40 +816,6 @@ contact_list_view_call_activated_cb (
        g_object_unref (contact);
 }
 
-#if HAVE_FAVOURITE_CONTACTS
-static void
-contact_list_view_favourite_toggled_cb (
-    EmpathyCellRendererActivatable *cell,
-    const gchar                    *path_string,
-    EmpathyContactListView         *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-       EmpathyContact *contact;
-       EmpathyContactList *list;
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-       if (!gtk_tree_model_get_iter_from_string (model, &iter, path_string))
-               return;
-
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                           -1);
-       if (contact == NULL)
-               return;
-
-       list = empathy_contact_list_store_get_list_iface (priv->store);
-       if (empathy_contact_list_is_favourite (list, contact)) {
-               empathy_contact_list_remove_from_favourites (list, contact);
-       } else {
-               empathy_contact_list_add_to_favourites (list, contact);
-       }
-
-       g_object_unref (contact);
-}
-#endif /* HAVE_FAVOURITE_CONTACTS */
-
 static void
 contact_list_view_cell_set_background (EmpathyContactListView *view,
                                       GtkCellRenderer       *cell,
@@ -1033,41 +998,6 @@ contact_list_view_expander_cell_data_func (GtkTreeViewColumn     *column,
        contact_list_view_cell_set_background (view, cell, is_group, is_active);
 }
 
-#if HAVE_FAVOURITE_CONTACTS
-static void
-contact_list_view_favourite_cell_data_func (
-                                      GtkTreeViewColumn      *tree_column,
-                                      GtkCellRenderer        *cell,
-                                      GtkTreeModel           *model,
-                                      GtkTreeIter            *iter,
-                                      EmpathyContactListView *view)
-{
-       gboolean is_group;
-       gboolean is_active;
-       gboolean is_separator;
-       gboolean is_favourite;
-       const gchar *icon_name = NULL;
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, &is_active,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE, &is_favourite,
-                           -1);
-
-       if (!is_separator && !is_group)
-               icon_name = (is_favourite? EMPATHY_IMAGE_FAVOURITE :
-                            EMPATHY_IMAGE_UNFAVOURITE);
-
-       g_object_set (cell,
-                     "visible", (icon_name != NULL),
-                     "icon-name", icon_name,
-                     NULL);
-
-       contact_list_view_cell_set_background (view, cell, is_group, is_active);
-}
-#endif /* HAVE_FAVOURITE_CONTACTS */
-
 static void
 contact_list_view_row_expand_or_collapse_cb (EmpathyContactListView *view,
                                             GtkTreeIter           *iter,
@@ -1171,24 +1101,6 @@ contact_list_view_setup (EmpathyContactListView *view)
 
        col = gtk_tree_view_column_new ();
 
-#if HAVE_FAVOURITE_CONTACTS
-       /* Favourite Icon */
-       cell = empathy_cell_renderer_activatable_new ();
-       gtk_tree_view_column_pack_start (col, cell, FALSE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_favourite_cell_data_func,
-               view, NULL);
-
-       g_object_set (cell,
-                     "visible", FALSE,
-                     NULL);
-
-       g_signal_connect (cell, "path-activated",
-                         G_CALLBACK (contact_list_view_favourite_toggled_cb),
-                         view);
-#endif
-
        /* State */
        cell = gtk_cell_renderer_pixbuf_new ();
        gtk_tree_view_column_pack_start (col, cell, FALSE);