]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-contact-list-view.c
Move the event manager to src/
[empathy.git] / libempathy-gtk / empathy-contact-list-view.c
index 24174c8b7ad4b2b7be2c51b1705e1b5e22a27d41..dd3dc54a6d5d5d682189711a42c6cd85e490c2fe 100644 (file)
 #include <string.h>
 
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include <libtelepathy/tp-helpers.h>
-
 #include <libmissioncontrol/mc-account.h>
-#include <libmissioncontrol/mission-control.h>
 
 #include <libempathy/empathy-contact-factory.h>
 #include <libempathy/empathy-contact-list.h>
-#include <libempathy/empathy-log-manager.h>
-#include <libempathy/empathy-tp-group.h>
 #include <libempathy/empathy-contact-groups.h>
-#include <libempathy/empathy-debug.h>
+#include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-contact-list-view.h"
 #include "empathy-cell-renderer-text.h"
 #include "empathy-cell-renderer-activatable.h"
 #include "empathy-ui-utils.h"
-#include "empathy-contact-dialogs.h"
-//#include "empathy-chat-invite.h"
-//#include "empathy-ft-window.h"
-#include "empathy-log-window.h"
 #include "empathy-gtk-enum-types.h"
 #include "empathy-gtk-marshal.h"
 
-#define DEBUG_DOMAIN "ContactListView"
-
-/* Flashing delay for icons (milliseconds). */
-#define FLASH_TIMEOUT 500
+#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
+#include <libempathy/empathy-debug.h>
 
 /* Active users are those which have recently changed state
  * (e.g. online, offline or from normal to a busy state).
  */
 
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CONTACT_LIST_VIEW, EmpathyContactListViewPriv))
-
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContactListView)
 typedef struct {
-       EmpathyContactListStore    *store;
-       GtkUIManager               *ui;
-       GtkTreeRowReference        *drag_row;
-       EmpathyContactListFeatures  features;
+       EmpathyContactListStore        *store;
+       GtkTreeRowReference            *drag_row;
+       EmpathyContactListFeatureFlags  list_features;
+       EmpathyContactFeatureFlags      contact_features;
+       GtkWidget                      *tooltip_widget;
 } EmpathyContactListViewPriv;
 
 typedef struct {
@@ -88,184 +78,13 @@ typedef struct {
        gboolean               remove;
 } ShowActiveData;
 
-static void        empathy_contact_list_view_class_init         (EmpathyContactListViewClass *klass);
-static void        empathy_contact_list_view_init               (EmpathyContactListView      *list);
-static void        contact_list_view_finalize                  (GObject                    *object);
-static void        contact_list_view_get_property              (GObject                    *object,
-                                                               guint                       param_id,
-                                                               GValue                     *value,
-                                                               GParamSpec                 *pspec);
-static void        contact_list_view_set_property              (GObject                    *object,
-                                                               guint                       param_id,
-                                                               const GValue               *value,
-                                                               GParamSpec                 *pspec);
-static void        contact_list_view_setup                     (EmpathyContactListView      *view);
-static void        contact_list_view_row_has_child_toggled_cb  (GtkTreeModel               *model,
-                                                               GtkTreePath                *path,
-                                                               GtkTreeIter                *iter,
-                                                               EmpathyContactListView      *view);
-static void        contact_list_view_drag_data_received        (GtkWidget                  *widget,
-                                                               GdkDragContext             *context,
-                                                               gint                        x,
-                                                               gint                        y,
-                                                               GtkSelectionData           *selection,
-                                                               guint                       info,
-                                                               guint                       time);
-static gboolean    contact_list_view_drag_motion               (GtkWidget                  *widget,
-                                                               GdkDragContext             *context,
-                                                               gint                        x,
-                                                               gint                        y,
-                                                               guint                       time);
-static gboolean    contact_list_view_drag_motion_cb            (DragMotionData             *data);
-static void        contact_list_view_drag_begin                (GtkWidget                  *widget,
-                                                               GdkDragContext             *context);
-static void        contact_list_view_drag_data_get             (GtkWidget                  *widget,
-                                                               GdkDragContext             *context,
-                                                               GtkSelectionData           *selection,
-                                                               guint                       info,
-                                                               guint                       time);
-static void        contact_list_view_drag_end                  (GtkWidget                  *widget,
-                                                               GdkDragContext             *context);
-static gboolean    contact_list_view_drag_drop                 (GtkWidget                  *widget,
-                                                               GdkDragContext             *drag_context,
-                                                               gint                        x,
-                                                               gint                        y,
-                                                               guint                       time);
-static void        contact_list_view_cell_set_background       (EmpathyContactListView      *view,
-                                                               GtkCellRenderer            *cell,
-                                                               gboolean                    is_group,
-                                                               gboolean                    is_active);
-static void        contact_list_view_pixbuf_cell_data_func     (GtkTreeViewColumn          *tree_column,
-                                                               GtkCellRenderer            *cell,
-                                                               GtkTreeModel               *model,
-                                                               GtkTreeIter                *iter,
-                                                               EmpathyContactListView     *view);
-#ifdef HAVE_VOIP
-static void        contact_list_view_voip_cell_data_func       (GtkTreeViewColumn          *tree_column,
-                                                               GtkCellRenderer            *cell,
-                                                               GtkTreeModel               *model,
-                                                               GtkTreeIter                *iter,
-                                                               EmpathyContactListView     *view);
-#endif
-static void        contact_list_view_avatar_cell_data_func     (GtkTreeViewColumn          *tree_column,
-                                                               GtkCellRenderer            *cell,
-                                                               GtkTreeModel               *model,
-                                                               GtkTreeIter                *iter,
-                                                               EmpathyContactListView      *view);
-static void        contact_list_view_text_cell_data_func       (GtkTreeViewColumn          *tree_column,
-                                                               GtkCellRenderer            *cell,
-                                                               GtkTreeModel               *model,
-                                                               GtkTreeIter                *iter,
-                                                               EmpathyContactListView      *view);
-static void        contact_list_view_expander_cell_data_func   (GtkTreeViewColumn          *column,
-                                                               GtkCellRenderer            *cell,
-                                                               GtkTreeModel               *model,
-                                                               GtkTreeIter                *iter,
-                                                               EmpathyContactListView      *view);
-static GtkWidget * contact_list_view_get_contact_menu          (EmpathyContactListView      *view,
-                                                               gboolean                    can_send_file,
-                                                               gboolean                    can_show_log,
-                                                               gboolean                    can_voip);
-static gboolean    contact_list_view_button_press_event_cb     (EmpathyContactListView      *view,
-                                                               GdkEventButton             *event,
-                                                               gpointer                    user_data);
-static void        contact_list_view_row_activated_cb          (EmpathyContactListView      *view,
-                                                               GtkTreePath                *path,
-                                                               GtkTreeViewColumn          *col,
-                                                               gpointer                    user_data);
-#ifdef HAVE_VOIP
-static void        contact_list_view_voip_activated_cb         (EmpathyCellRendererActivatable *cell,
-                                                               const gchar                *path_string,
-                                                               EmpathyContactListView     *view);
-#endif
-static void        contact_list_view_row_expand_or_collapse_cb (EmpathyContactListView      *view,
-                                                               GtkTreeIter                *iter,
-                                                               GtkTreePath                *path,
-                                                               gpointer                    user_data);
-static void        contact_list_view_action_cb                 (GtkAction                  *action,
-                                                               EmpathyContactListView      *view);
-static void        contact_list_view_voip_activated            (EmpathyContactListView      *view,
-                                                               EmpathyContact              *contact);
-
 enum {
        PROP_0,
-       PROP_FEATURES
-};
-
-static const GtkActionEntry entries[] = {
-       { "ContactMenu", NULL,
-         N_("_Contact"), NULL, NULL,
-         NULL
-       },
-       { "GroupMenu", NULL,
-         N_("_Group"),NULL, NULL,
-         NULL
-       },
-       { "Chat", EMPATHY_IMAGE_MESSAGE,
-         N_("_Chat"), NULL, N_("Chat with contact"),
-         G_CALLBACK (contact_list_view_action_cb)
-       },
-       { "Information", EMPATHY_IMAGE_CONTACT_INFORMATION,
-         N_("Infor_mation"), "<control>I", N_("View contact information"),
-         G_CALLBACK (contact_list_view_action_cb)
-       },
-       { "Rename", NULL,
-         N_("Re_name"), NULL, N_("Rename"),
-         G_CALLBACK (contact_list_view_action_cb)
-       },
-       { "Edit", GTK_STOCK_EDIT,
-         N_("_Edit"), NULL, N_("Edit the groups and name for this contact"),
-         G_CALLBACK (contact_list_view_action_cb)
-       },
-       { "Remove", GTK_STOCK_REMOVE,
-         N_("_Remove"), NULL, N_("Remove contact"),
-         G_CALLBACK (contact_list_view_action_cb)
-       },
-       { "Invite", EMPATHY_IMAGE_GROUP_MESSAGE,
-         N_("_Invite to Chat Room"), NULL, N_("Invite to a currently open chat room"),
-         G_CALLBACK (contact_list_view_action_cb)
-       },
-       { "SendFile", NULL,
-         N_("_Send File..."), NULL, N_("Send a file"),
-         G_CALLBACK (contact_list_view_action_cb)
-       },
-       { "Log", EMPATHY_IMAGE_LOG,
-         N_("_View Previous Conversations"), NULL, N_("View previous conversations with this contact"),
-         G_CALLBACK (contact_list_view_action_cb)
-       },
-#ifdef HAVE_VOIP
-       { "Call", EMPATHY_IMAGE_VOIP,
-         N_("_Call"), NULL, N_("Start a voice or video conversation with this contact"),
-         G_CALLBACK (contact_list_view_action_cb)
-       },
-#endif
+       PROP_STORE,
+       PROP_LIST_FEATURES,
+       PROP_CONTACT_FEATURES,
 };
 
-static guint n_entries = G_N_ELEMENTS (entries);
-
-static const gchar *ui_info =
-       "<ui>"
-       "  <popup name='Contact'>"
-       "    <menuitem action='Chat'/>"
-#ifdef HAVE_VOIP
-       "    <menuitem action='Call'/>"
-#endif
-       "    <menuitem action='Log'/>"
-       "    <menuitem action='SendFile'/>"
-       "    <separator/>"
-       "    <menuitem action='Invite'/>"
-       "    <separator/>"
-       "    <menuitem action='Edit'/>"
-       "    <menuitem action='Remove'/>"
-       "    <separator/>"
-       "    <menuitem action='Information'/>"
-       "  </popup>"
-       "  <popup name='Group'>"
-       "    <menuitem action='Rename'/>"
-       "    <menuitem action='Remove'/>"
-       "  </popup>"
-       "</ui>";
-
 enum DndDragType {
        DND_DRAG_TYPE_CONTACT_ID,
        DND_DRAG_TYPE_URL,
@@ -295,603 +114,223 @@ static guint signals[LAST_SIGNAL];
 
 G_DEFINE_TYPE (EmpathyContactListView, empathy_contact_list_view, GTK_TYPE_TREE_VIEW);
 
-static void
-empathy_contact_list_view_class_init (EmpathyContactListViewClass *klass)
+static gboolean
+contact_list_view_query_tooltip_cb (EmpathyContactListView *view,
+                                   gint                    x,
+                                   gint                    y,
+                                   gboolean                keyboard_mode,
+                                   GtkTooltip             *tooltip,
+                                   gpointer                user_data)
 {
-       GObjectClass   *object_class = G_OBJECT_CLASS (klass);
-       GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+       EmpathyContactListViewPriv *priv = GET_PRIV (view);
+       EmpathyContact             *contact;
+       GtkTreeModel               *model;
+       GtkTreeIter                 iter;
+       GtkTreePath                *path;
 
-       object_class->finalize = contact_list_view_finalize;
-       object_class->get_property = contact_list_view_get_property;
-       object_class->set_property = contact_list_view_set_property;
+       /* FIXME: We need GTK version >= 2.12.10. See GNOME bug #504087 */
+       if (gtk_check_version (2, 12, 10)) {
+               return FALSE;
+       }
 
-       widget_class->drag_data_received = contact_list_view_drag_data_received;
-       widget_class->drag_drop          = contact_list_view_drag_drop;
-       widget_class->drag_begin         = contact_list_view_drag_begin;
-       widget_class->drag_data_get      = contact_list_view_drag_data_get;
-       widget_class->drag_end           = contact_list_view_drag_end;
-       /* FIXME: noticed but when you drag the row over the treeview
-        * fast, it seems to stop redrawing itself, if we don't
-        * connect this signal, all is fine.
-        */
-       widget_class->drag_motion        = contact_list_view_drag_motion;
+       if (!gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (view), &x, &y,
+                                               keyboard_mode,
+                                               &model, &path, &iter)) {
+               return FALSE;
+       }
 
-       signals[DRAG_CONTACT_RECEIVED] =
-               g_signal_new ("drag-contact-received",
-                             G_OBJECT_CLASS_TYPE (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             _empathy_gtk_marshal_VOID__OBJECT_STRING_STRING,
-                             G_TYPE_NONE,
-                             3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_STRING);
+       gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (view), tooltip, path);
+       gtk_tree_path_free (path);
 
-       g_object_class_install_property (object_class,
-                                        PROP_FEATURES,
-                                        g_param_spec_flags ("features",
-                                                            "Features of the view",
-                                                            "Falgs for all enabled features",
-                                                             EMPATHY_TYPE_CONTACT_LIST_FEATURES,
-                                                             0,
-                                                             G_PARAM_READWRITE));
+       gtk_tree_model_get (model, &iter,
+                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
+                           -1);
+       if (!contact) {
+               return FALSE;
+       }
 
-       g_type_class_add_private (object_class, sizeof (EmpathyContactListViewPriv));
+       if (!priv->tooltip_widget) {
+               priv->tooltip_widget = empathy_contact_widget_new (contact,
+                       EMPATHY_CONTACT_WIDGET_EDIT_NONE);
+               g_object_add_weak_pointer (G_OBJECT (priv->tooltip_widget),
+                                          (gpointer) &priv->tooltip_widget);
+       } else {
+               empathy_contact_widget_set_contact (priv->tooltip_widget,
+                                                   contact);
+       }
+
+       gtk_tooltip_set_custom (tooltip, priv->tooltip_widget);
+
+       g_object_unref (contact);
+
+       return TRUE;
 }
 
 static void
-empathy_contact_list_view_init (EmpathyContactListView *view)
+contact_list_view_drag_data_received (GtkWidget         *widget,
+                                     GdkDragContext    *context,
+                                     gint               x,
+                                     gint               y,
+                                     GtkSelectionData  *selection,
+                                     guint              info,
+                                     guint              time)
 {
        EmpathyContactListViewPriv *priv;
-       GtkActionGroup            *action_group;
-       GError                    *error = NULL;
-
-       priv = GET_PRIV (view);
+       EmpathyContactList         *list;
+       EmpathyContactFactory      *factory;
+       McAccount                  *account;
+       GtkTreeModel               *model;
+       GtkTreePath                *path;
+       GtkTreeViewDropPosition     position;
+       EmpathyContact             *contact = NULL;
+       const gchar                *id;
+       gchar                     **strv;
+       gchar                      *new_group = NULL;
+       gchar                      *old_group = NULL;
+       gboolean                    is_row;
 
-       /* Get saved group states. */
-       empathy_contact_groups_get_all ();
+       priv = GET_PRIV (widget);
 
-       /* Set up UI Manager */
-       priv->ui = gtk_ui_manager_new ();
+       id = (const gchar*) selection->data;
+       DEBUG ("Received %s%s drag & drop contact from roster with id:'%s'",
+               context->action == GDK_ACTION_MOVE ? "move" : "",
+               context->action == GDK_ACTION_COPY ? "copy" : "",
+               id);
 
-       action_group = gtk_action_group_new ("Actions");
-       gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
-       gtk_action_group_add_actions (action_group, entries, n_entries, view);
-       gtk_ui_manager_insert_action_group (priv->ui, action_group, 0);
+       strv = g_strsplit (id, "/", 2);
+       factory = empathy_contact_factory_new ();
+       account = mc_account_lookup (strv[0]);
+       if (account) {
+               contact = empathy_contact_factory_get_from_id (factory,
+                                                              account,
+                                                              strv[1]);
+               g_object_unref (account);
+       }
+       g_object_unref (factory);
+       g_strfreev (strv);
 
-       if (!gtk_ui_manager_add_ui_from_string (priv->ui, ui_info, -1, &error)) {
-               g_warning ("Could not build contact menus from string:'%s'", error->message);
-               g_error_free (error);
+       if (!contact) {
+               DEBUG ("No contact found associated with drag & drop");
+               return;
        }
 
-       g_object_unref (action_group);
+       empathy_contact_run_until_ready (contact,
+                                        EMPATHY_CONTACT_READY_HANDLE,
+                                        NULL);
 
-       gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (view), 
-                                             empathy_contact_list_store_row_separator_func,
-                                             NULL, NULL);
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
 
-       /* Connect to tree view signals rather than override. */
-       g_signal_connect (view,
-                         "button-press-event",
-                         G_CALLBACK (contact_list_view_button_press_event_cb),
-                         NULL);
-       g_signal_connect (view,
-                         "row-activated",
-                         G_CALLBACK (contact_list_view_row_activated_cb),
-                         NULL);
-       g_signal_connect (view,
-                         "row-expanded",
-                         G_CALLBACK (contact_list_view_row_expand_or_collapse_cb),
-                         GINT_TO_POINTER (TRUE));
-       g_signal_connect (view,
-                         "row-collapsed",
-                         G_CALLBACK (contact_list_view_row_expand_or_collapse_cb),
-                         GINT_TO_POINTER (FALSE));
-}
+       /* Get source group information. */
+       if (priv->drag_row) {
+               path = gtk_tree_row_reference_get_path (priv->drag_row);
+               if (path) {
+                       old_group = empathy_contact_list_store_get_parent_group (model, path, NULL);
+                       gtk_tree_path_free (path);
+               }
+       }
 
-static void
-contact_list_view_finalize (GObject *object)
-{
-       EmpathyContactListViewPriv *priv;
+       /* Get destination group information. */
+       is_row = gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
+                                                   x,
+                                                   y,
+                                                   &path,
+                                                   &position);
 
-       priv = GET_PRIV (object);
+       if (is_row) {
+               new_group = empathy_contact_list_store_get_parent_group (model, path, NULL);
+               gtk_tree_path_free (path);
+       }
 
-       if (priv->ui) {
-               g_object_unref (priv->ui);
+       DEBUG ("contact %s (%d) dragged from '%s' to '%s'",
+               empathy_contact_get_id (contact),
+               empathy_contact_get_handle (contact),
+               old_group, new_group);
+
+       list = empathy_contact_list_store_get_list_iface (priv->store);
+       if (new_group) {
+               empathy_contact_list_add_to_group (list, contact, new_group);
        }
-       if (priv->store) {
-               g_object_unref (priv->store);
+       if (old_group && context->action == GDK_ACTION_MOVE) {  
+               empathy_contact_list_remove_from_group (list, contact, old_group);
        }
 
-       G_OBJECT_CLASS (empathy_contact_list_view_parent_class)->finalize (object);
+       g_free (old_group);
+       g_free (new_group);
+
+       gtk_drag_finish (context, TRUE, FALSE, GDK_CURRENT_TIME);
 }
 
-static void
-contact_list_view_get_property (GObject    *object,
-                               guint       param_id,
-                               GValue     *value,
-                               GParamSpec *pspec)
+static gboolean
+contact_list_view_drag_motion_cb (DragMotionData *data)
 {
-       EmpathyContactListViewPriv *priv;
+       gtk_tree_view_expand_row (GTK_TREE_VIEW (data->view),
+                                 data->path,
+                                 FALSE);
 
-       priv = GET_PRIV (object);
+       data->timeout_id = 0;
 
-       switch (param_id) {
-       case PROP_FEATURES:
-               g_value_set_flags (value, priv->features);
-               break;
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-               break;
-       };
+       return FALSE;
 }
 
-static void
-contact_list_view_set_property (GObject      *object,
-                               guint         param_id,
-                               const GValue *value,
-                               GParamSpec   *pspec)
+static gboolean
+contact_list_view_drag_motion (GtkWidget      *widget,
+                              GdkDragContext *context,
+                              gint            x,
+                              gint            y,
+                              guint           time)
 {
-       EmpathyContactListView     *view = EMPATHY_CONTACT_LIST_VIEW (object);
-       EmpathyContactListViewPriv *priv;
-
-       priv = GET_PRIV (object);
+       static DragMotionData *dm = NULL;
+       GtkTreePath           *path;
+       gboolean               is_row;
+       gboolean               is_different = FALSE;
+       gboolean               cleanup = TRUE;
 
-       switch (param_id) {
-       case PROP_FEATURES:
-               empathy_contact_list_view_set_features (view, g_value_get_flags (value));
-               break;
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-               break;
-       };
-}
+       is_row = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
+                                               x,
+                                               y,
+                                               &path,
+                                               NULL,
+                                               NULL,
+                                               NULL);
 
-EmpathyContactListView *
-empathy_contact_list_view_new (EmpathyContactListStore    *store,
-                              EmpathyContactListFeatures  features)
-{
-       EmpathyContactListView     *view;
-       EmpathyContactListViewPriv *priv;
+       cleanup &= (!dm);
 
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), NULL);
-       
-       view = g_object_new (EMPATHY_TYPE_CONTACT_LIST_VIEW,
-                           "features", features,
-                           NULL);
+       if (is_row) {
+               cleanup &= (dm && gtk_tree_path_compare (dm->path, path) != 0);
+               is_different = (!dm || (dm && gtk_tree_path_compare (dm->path, path) != 0));
+       } else {
+               cleanup &= FALSE;
+       }
 
-       priv = GET_PRIV (view);
-       priv->store = g_object_ref (store);
-       contact_list_view_setup (EMPATHY_CONTACT_LIST_VIEW (view));
+       if (!is_different && !cleanup) {
+               return TRUE;
+       }
 
-       return view;
-}
+       if (dm) {
+               gtk_tree_path_free (dm->path);
+               if (dm->timeout_id) {
+                       g_source_remove (dm->timeout_id);
+               }
 
-void
-empathy_contact_list_view_set_features (EmpathyContactListView     *view,
-                                       EmpathyContactListFeatures  features)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
+               g_free (dm);
 
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view));
+               dm = NULL;
+       }
 
-       priv->features = features;
+       if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), path)) {
+               dm = g_new0 (DragMotionData, 1);
 
-       /* Update DnD source/dest */
-       if (features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DRAG) {
-               gtk_drag_source_set (GTK_WIDGET (view),
-                                    GDK_BUTTON1_MASK,
-                                    drag_types_source,
-                                    G_N_ELEMENTS (drag_types_source),
-                                    GDK_ACTION_MOVE | GDK_ACTION_COPY);
-       } else {
-               gtk_drag_source_unset (GTK_WIDGET (view));
+               dm->view = EMPATHY_CONTACT_LIST_VIEW (widget);
+               dm->path = gtk_tree_path_copy (path);
 
-       }
-
-       if (features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DROP) {
-               gtk_drag_dest_set (GTK_WIDGET (view),
-                                  GTK_DEST_DEFAULT_ALL,
-                                  drag_types_dest,
-                                  G_N_ELEMENTS (drag_types_dest),
-                                  GDK_ACTION_MOVE | GDK_ACTION_COPY);
-       } else {
-               /* FIXME: URI could still be  droped depending on FT feature */
-               gtk_drag_dest_unset (GTK_WIDGET (view));
-       }
-
-       g_object_notify (G_OBJECT (view), "features");
-}
-
-EmpathyContactListFeatures
-empathy_contact_list_view_get_features (EmpathyContactListView  *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), FALSE);
-
-       return priv->features;
-}
-
-EmpathyContact *
-empathy_contact_list_view_get_selected (EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv;
-       GtkTreeSelection          *selection;
-       GtkTreeIter                iter;
-       GtkTreeModel              *model;
-       EmpathyContact             *contact;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
-
-       priv = GET_PRIV (view);
-
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
-       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-               return NULL;
-       }
-
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                           -1);
-
-       return contact;
-}
-
-gchar *
-empathy_contact_list_view_get_selected_group (EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv;
-       GtkTreeSelection          *selection;
-       GtkTreeIter                iter;
-       GtkTreeModel              *model;
-       gboolean                   is_group;
-       gchar                     *name;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
-
-       priv = GET_PRIV (view);
-
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
-       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-               return NULL;
-       }
-
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-                           -1);
-
-       if (!is_group) {
-               g_free (name);
-               return NULL;
-       }
-
-       return name;
-}
-
-static void
-contact_list_view_setup (EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv;
-       GtkCellRenderer           *cell;
-       GtkTreeViewColumn         *col;
-       gint                       i;
-
-       priv = GET_PRIV (view);
-
-       gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (view),
-                                            empathy_contact_list_store_search_equal_func,
-                                            NULL, NULL);
-
-       g_signal_connect (priv->store, "row-has-child-toggled",
-                         G_CALLBACK (contact_list_view_row_has_child_toggled_cb),
-                         view);
-       gtk_tree_view_set_model (GTK_TREE_VIEW (view),
-                                GTK_TREE_MODEL (priv->store));
-
-       /* Setup view */
-       g_object_set (view,
-                     "headers-visible", FALSE,
-                     "reorderable", TRUE,
-                     "show-expanders", FALSE,
-                     NULL);
-
-       col = gtk_tree_view_column_new ();
-
-       /* State */
-       cell = gtk_cell_renderer_pixbuf_new ();
-       gtk_tree_view_column_pack_start (col, cell, FALSE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_pixbuf_cell_data_func,
-               view, NULL);
-
-       g_object_set (cell,
-                     "xpad", 5,
-                     "ypad", 1,
-                     "visible", FALSE,
-                     NULL);
-
-       /* Name */
-       cell = empathy_cell_renderer_text_new ();
-       gtk_tree_view_column_pack_start (col, cell, TRUE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_text_cell_data_func,
-               view, NULL);
-
-       gtk_tree_view_column_add_attribute (col, cell,
-                                           "name", EMPATHY_CONTACT_LIST_STORE_COL_NAME);
-       gtk_tree_view_column_add_attribute (col, cell,
-                                           "status", EMPATHY_CONTACT_LIST_STORE_COL_STATUS);
-       gtk_tree_view_column_add_attribute (col, cell,
-                                           "is_group", EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP);
-
-#ifdef HAVE_VOIP
-       /* Voip Capability 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_voip_cell_data_func,
-               view, NULL);
-
-       g_object_set (cell,
-                     "visible", FALSE,
-                     NULL);
-
-       g_signal_connect (cell, "path-activated",
-                         G_CALLBACK (contact_list_view_voip_activated_cb),
-                         view);
-#endif
-
-       /* Avatar */
-       cell = gtk_cell_renderer_pixbuf_new ();
-       gtk_tree_view_column_pack_start (col, cell, FALSE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_avatar_cell_data_func,
-               view, NULL);
-
-       g_object_set (cell,
-                     "xpad", 0,
-                     "ypad", 0,
-                     "visible", FALSE,
-                     "width", 32,
-                     "height", 32,
-                     NULL);
-
-       /* Expander */
-       cell = empathy_cell_renderer_expander_new ();
-       gtk_tree_view_column_pack_end (col, cell, FALSE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_expander_cell_data_func,
-               view, NULL);
-
-       /* Actually add the column now we have added all cell renderers */
-       gtk_tree_view_append_column (GTK_TREE_VIEW (view), col);
-
-       /* Drag & Drop. */
-       for (i = 0; i < G_N_ELEMENTS (drag_types_dest); ++i) {
-               drag_atoms_dest[i] = gdk_atom_intern (drag_types_dest[i].target,
-                                                     FALSE);
-       }
-
-       for (i = 0; i < G_N_ELEMENTS (drag_types_source); ++i) {
-               drag_atoms_source[i] = gdk_atom_intern (drag_types_source[i].target,
-                                                       FALSE);
-       }
-}
-
-static void
-contact_list_view_row_has_child_toggled_cb (GtkTreeModel          *model,
-                                           GtkTreePath           *path,
-                                           GtkTreeIter           *iter,
-                                           EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       gboolean  is_group = FALSE;
-       gchar    *name = NULL;
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-                           -1);
-
-       if (!is_group || G_STR_EMPTY (name)) {
-               g_free (name);
-               return;
-       }
-
-       if (!(priv->features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_SAVE) ||
-           empathy_contact_group_get_expanded (name)) {
-               g_signal_handlers_block_by_func (view,
-                                                contact_list_view_row_expand_or_collapse_cb,
-                                                GINT_TO_POINTER (TRUE));
-               gtk_tree_view_expand_row (GTK_TREE_VIEW (view), path, TRUE);
-               g_signal_handlers_unblock_by_func (view,
-                                                  contact_list_view_row_expand_or_collapse_cb,
-                                                  GINT_TO_POINTER (TRUE));
-       } else {
-               g_signal_handlers_block_by_func (view,
-                                                contact_list_view_row_expand_or_collapse_cb,
-                                                GINT_TO_POINTER (FALSE));
-               gtk_tree_view_collapse_row (GTK_TREE_VIEW (view), path);
-               g_signal_handlers_unblock_by_func (view,
-                                                  contact_list_view_row_expand_or_collapse_cb,
-                                                  GINT_TO_POINTER (FALSE));
-       }
-
-       g_free (name);
-}
-
-static void
-contact_list_view_drag_data_received (GtkWidget         *widget,
-                                     GdkDragContext    *context,
-                                     gint               x,
-                                     gint               y,
-                                     GtkSelectionData  *selection,
-                                     guint              info,
-                                     guint              time)
-{
-       EmpathyContactListViewPriv *priv;
-       EmpathyContactList         *list;
-       EmpathyContactFactory      *factory;
-       McAccount                  *account;
-       GtkTreeModel               *model;
-       GtkTreePath                *path;
-       GtkTreeViewDropPosition     position;
-       EmpathyContact             *contact = NULL;
-       const gchar                *id;
-       gchar                     **strv;
-       gchar                      *new_group = NULL;
-       gchar                      *old_group = NULL;
-       gboolean                    is_row;
-
-       priv = GET_PRIV (widget);
-
-       id = (const gchar*) selection->data;
-       empathy_debug (DEBUG_DOMAIN, "Received %s%s drag & drop contact from roster with id:'%s'",
-                     context->action == GDK_ACTION_MOVE ? "move" : "",
-                     context->action == GDK_ACTION_COPY ? "copy" : "",
-                     id);
-
-       strv = g_strsplit (id, "/", 2);
-       factory = empathy_contact_factory_new ();
-       account = mc_account_lookup (strv[0]);
-       if (account) {
-               contact = empathy_contact_factory_get_from_id (factory,
-                                                              account,
-                                                              strv[1]);
-               g_object_unref (account);
-       }
-       g_object_unref (factory);
-       g_strfreev (strv);
-
-       if (!contact) {
-               empathy_debug (DEBUG_DOMAIN, "No contact found associated with drag & drop");
-               return;
-       }
-
-       empathy_contact_run_until_ready (contact,
-                                        EMPATHY_CONTACT_READY_HANDLE,
-                                        NULL);
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-
-       /* Get source group information. */
-       if (priv->drag_row) {
-               path = gtk_tree_row_reference_get_path (priv->drag_row);
-               if (path) {
-                       old_group = empathy_contact_list_store_get_parent_group (model, path, NULL);
-                       gtk_tree_path_free (path);
-               }
-       }
-
-       /* Get destination group information. */
-       is_row = gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
-                                                   x,
-                                                   y,
-                                                   &path,
-                                                   &position);
-
-       if (is_row) {
-               new_group = empathy_contact_list_store_get_parent_group (model, path, NULL);
-               gtk_tree_path_free (path);
-       }
-
-       empathy_debug (DEBUG_DOMAIN,
-                     "contact %s (%d) dragged from '%s' to '%s'",
-                     empathy_contact_get_id (contact),
-                     empathy_contact_get_handle (contact),
-                     old_group, new_group);
-
-       list = empathy_contact_list_store_get_list_iface (priv->store);
-       if (new_group) {
-               empathy_contact_list_add_to_group (list, contact, new_group);
-       }
-       if (old_group && context->action == GDK_ACTION_MOVE) {  
-               empathy_contact_list_remove_from_group (list, contact, old_group);
-       }
-
-       g_free (old_group);
-       g_free (new_group);
-
-       gtk_drag_finish (context, TRUE, FALSE, GDK_CURRENT_TIME);
-}
-
-static gboolean
-contact_list_view_drag_motion (GtkWidget      *widget,
-                              GdkDragContext *context,
-                              gint            x,
-                              gint            y,
-                              guint           time)
-{
-       static DragMotionData *dm = NULL;
-       GtkTreePath           *path;
-       gboolean               is_row;
-       gboolean               is_different = FALSE;
-       gboolean               cleanup = TRUE;
-
-       is_row = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
-                                               x,
-                                               y,
-                                               &path,
-                                               NULL,
-                                               NULL,
-                                               NULL);
-
-       cleanup &= (!dm);
-
-       if (is_row) {
-               cleanup &= (dm && gtk_tree_path_compare (dm->path, path) != 0);
-               is_different = (!dm || (dm && gtk_tree_path_compare (dm->path, path) != 0));
-       } else {
-               cleanup &= FALSE;
-       }
-
-       if (!is_different && !cleanup) {
-               return TRUE;
-       }
-
-       if (dm) {
-               gtk_tree_path_free (dm->path);
-               if (dm->timeout_id) {
-                       g_source_remove (dm->timeout_id);
-               }
-
-               g_free (dm);
-
-               dm = NULL;
-       }
-
-       if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), path)) {
-               dm = g_new0 (DragMotionData, 1);
-
-               dm->view = EMPATHY_CONTACT_LIST_VIEW (widget);
-               dm->path = gtk_tree_path_copy (path);
-
-               dm->timeout_id = g_timeout_add_seconds (1,
-                       (GSourceFunc) contact_list_view_drag_motion_cb,
-                       dm);
+               dm->timeout_id = g_timeout_add_seconds (1,
+                       (GSourceFunc) contact_list_view_drag_motion_cb,
+                       dm);
        }
 
        return TRUE;
 }
 
-static gboolean
-contact_list_view_drag_motion_cb (DragMotionData *data)
-{
-       gtk_tree_view_expand_row (GTK_TREE_VIEW (data->view),
-                                 data->path,
-                                 FALSE);
-
-       data->timeout_id = 0;
-
-       return FALSE;
-}
-
 static void
 contact_list_view_drag_begin (GtkWidget      *widget,
                              GdkDragContext *context)
@@ -991,16 +430,139 @@ contact_list_view_drag_end (GtkWidget      *widget,
        }
 }
 
-static gboolean
-contact_list_view_drag_drop (GtkWidget      *widget,
-                            GdkDragContext *drag_context,
-                            gint            x,
-                            gint            y,
-                            guint           time)
-{
-       return FALSE;
-}
-
+static gboolean
+contact_list_view_drag_drop (GtkWidget      *widget,
+                            GdkDragContext *drag_context,
+                            gint            x,
+                            gint            y,
+                            guint           time)
+{
+       return FALSE;
+}
+
+typedef struct {
+       EmpathyContactListView *view;
+       guint                   button;
+       guint32                 time;
+} MenuPopupData;
+
+static gboolean
+contact_list_view_popup_menu_idle_cb (gpointer user_data)
+{
+       MenuPopupData *data = user_data;
+       GtkWidget     *menu;
+
+       menu = empathy_contact_list_view_get_contact_menu (data->view);
+       if (!menu) {
+               menu = empathy_contact_list_view_get_group_menu (data->view);
+       }
+
+       if (menu) {
+               gtk_widget_show (menu);
+               gtk_menu_popup (GTK_MENU (menu),
+                               NULL, NULL, NULL, NULL,
+                               data->button, data->time);
+       }
+
+       g_slice_free (MenuPopupData, data);
+
+       return FALSE;
+}
+
+static gboolean
+contact_list_view_button_press_event_cb (EmpathyContactListView *view,
+                                        GdkEventButton         *event,
+                                        gpointer                user_data)
+{
+       if (event->button == 3) {
+               MenuPopupData *data;
+
+               data = g_slice_new (MenuPopupData);
+               data->view = view;
+               data->button = event->button;
+               data->time = event->time;
+               g_idle_add (contact_list_view_popup_menu_idle_cb, data);
+       }
+
+       return FALSE;
+}
+
+static gboolean
+contact_list_view_key_press_event_cb (EmpathyContactListView *view,
+                                     GdkEventKey            *event,
+                                     gpointer                user_data)
+{
+       if (event->keyval == GDK_Menu) {
+               MenuPopupData *data;
+
+               data = g_slice_new (MenuPopupData);
+               data->view = view;
+               data->button = 0;
+               data->time = event->time;
+               g_idle_add (contact_list_view_popup_menu_idle_cb, data);
+       }
+
+       return FALSE;
+}
+
+static void
+contact_list_view_row_activated_cb (EmpathyContactListView *view,
+                                   GtkTreePath            *path,
+                                   GtkTreeViewColumn      *col,
+                                   gpointer                user_data)
+{
+       EmpathyContactListViewPriv *priv = GET_PRIV (view);
+       EmpathyContact             *contact;
+       GtkTreeModel               *model;
+       GtkTreeIter                 iter;
+
+       model = GTK_TREE_MODEL (priv->store);
+       gtk_tree_model_get_iter (model, &iter, path);
+       gtk_tree_model_get (model, &iter,
+                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
+                           -1);
+
+       if (!contact) {
+               return;
+       }
+
+       /* There is no event for the contact, default action is starting a chat */
+       if (priv->contact_features & EMPATHY_CONTACT_FEATURE_CHAT) {
+               empathy_dispatcher_chat_with_contact (contact);
+       }
+
+       g_object_unref (contact);
+}
+
+static void
+contact_list_view_voip_activated_cb (EmpathyCellRendererActivatable *cell,
+                                    const gchar                    *path_string,
+                                    EmpathyContactListView         *view)
+{
+       EmpathyContactListViewPriv *priv = GET_PRIV (view);
+       GtkTreeModel               *model;
+       GtkTreeIter                 iter;
+       EmpathyContact             *contact;
+
+       if (!(priv->contact_features & EMPATHY_CONTACT_FEATURE_CALL)) {
+               return;
+       }
+
+       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) {
+               empathy_dispatcher_call_with_contact (contact);
+               g_object_unref (contact);
+       }
+}
+
 static void
 contact_list_view_cell_set_background (EmpathyContactListView *view,
                                       GtkCellRenderer       *cell,
@@ -1061,7 +623,6 @@ contact_list_view_pixbuf_cell_data_func (GtkTreeViewColumn     *tree_column,
        contact_list_view_cell_set_background (view, cell, is_group, is_active);
 }
 
-#ifdef HAVE_VOIP
 static void
 contact_list_view_voip_cell_data_func (GtkTreeViewColumn      *tree_column,
                                       GtkCellRenderer        *cell,
@@ -1086,7 +647,6 @@ contact_list_view_voip_cell_data_func (GtkTreeViewColumn      *tree_column,
 
        contact_list_view_cell_set_background (view, cell, is_group, is_active);
 }
-#endif
 
 static void
 contact_list_view_avatar_cell_data_func (GtkTreeViewColumn     *tree_column,
@@ -1174,333 +734,648 @@ contact_list_view_expander_cell_data_func (GtkTreeViewColumn     *column,
                g_object_set (cell, "visible", FALSE, NULL);
        }
 
-       contact_list_view_cell_set_background (view, cell, is_group, is_active);
+       contact_list_view_cell_set_background (view, cell, is_group, is_active);
+}
+
+static void
+contact_list_view_row_expand_or_collapse_cb (EmpathyContactListView *view,
+                                            GtkTreeIter           *iter,
+                                            GtkTreePath           *path,
+                                            gpointer               user_data)
+{
+       EmpathyContactListViewPriv *priv = GET_PRIV (view);
+       GtkTreeModel               *model;
+       gchar                      *name;
+       gboolean                    expanded;
+
+       if (!(priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_SAVE)) {
+               return;
+       }
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
+
+       gtk_tree_model_get (model, iter,
+                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
+                           -1);
+
+       expanded = GPOINTER_TO_INT (user_data);
+       empathy_contact_group_set_expanded (name, expanded);
+
+       g_free (name);
+}
+
+static void
+contact_list_view_row_has_child_toggled_cb (GtkTreeModel          *model,
+                                           GtkTreePath           *path,
+                                           GtkTreeIter           *iter,
+                                           EmpathyContactListView *view)
+{
+       EmpathyContactListViewPriv *priv = GET_PRIV (view);
+       gboolean  is_group = FALSE;
+       gchar    *name = NULL;
+
+       gtk_tree_model_get (model, iter,
+                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
+                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
+                           -1);
+
+       if (!is_group || G_STR_EMPTY (name)) {
+               g_free (name);
+               return;
+       }
+
+       if (!(priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_SAVE) ||
+           empathy_contact_group_get_expanded (name)) {
+               g_signal_handlers_block_by_func (view,
+                                                contact_list_view_row_expand_or_collapse_cb,
+                                                GINT_TO_POINTER (TRUE));
+               gtk_tree_view_expand_row (GTK_TREE_VIEW (view), path, TRUE);
+               g_signal_handlers_unblock_by_func (view,
+                                                  contact_list_view_row_expand_or_collapse_cb,
+                                                  GINT_TO_POINTER (TRUE));
+       } else {
+               g_signal_handlers_block_by_func (view,
+                                                contact_list_view_row_expand_or_collapse_cb,
+                                                GINT_TO_POINTER (FALSE));
+               gtk_tree_view_collapse_row (GTK_TREE_VIEW (view), path);
+               g_signal_handlers_unblock_by_func (view,
+                                                  contact_list_view_row_expand_or_collapse_cb,
+                                                  GINT_TO_POINTER (FALSE));
+       }
+
+       g_free (name);
+}
+
+static void
+contact_list_view_setup (EmpathyContactListView *view)
+{
+       EmpathyContactListViewPriv *priv;
+       GtkCellRenderer           *cell;
+       GtkTreeViewColumn         *col;
+       gint                       i;
+
+       priv = GET_PRIV (view);
+
+       gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (view),
+                                            empathy_contact_list_store_search_equal_func,
+                                            NULL, NULL);
+
+       g_signal_connect (priv->store, "row-has-child-toggled",
+                         G_CALLBACK (contact_list_view_row_has_child_toggled_cb),
+                         view);
+       gtk_tree_view_set_model (GTK_TREE_VIEW (view),
+                                GTK_TREE_MODEL (priv->store));
+
+       /* Setup view */
+       g_object_set (view,
+                     "headers-visible", FALSE,
+                     "reorderable", TRUE,
+                     "show-expanders", FALSE,
+                     NULL);
+
+       col = gtk_tree_view_column_new ();
+
+       /* State */
+       cell = gtk_cell_renderer_pixbuf_new ();
+       gtk_tree_view_column_pack_start (col, cell, FALSE);
+       gtk_tree_view_column_set_cell_data_func (
+               col, cell,
+               (GtkTreeCellDataFunc) contact_list_view_pixbuf_cell_data_func,
+               view, NULL);
+
+       g_object_set (cell,
+                     "xpad", 5,
+                     "ypad", 1,
+                     "visible", FALSE,
+                     NULL);
+
+       /* Name */
+       cell = empathy_cell_renderer_text_new ();
+       gtk_tree_view_column_pack_start (col, cell, TRUE);
+       gtk_tree_view_column_set_cell_data_func (
+               col, cell,
+               (GtkTreeCellDataFunc) contact_list_view_text_cell_data_func,
+               view, NULL);
+
+       gtk_tree_view_column_add_attribute (col, cell,
+                                           "name", EMPATHY_CONTACT_LIST_STORE_COL_NAME);
+       gtk_tree_view_column_add_attribute (col, cell,
+                                           "status", EMPATHY_CONTACT_LIST_STORE_COL_STATUS);
+       gtk_tree_view_column_add_attribute (col, cell,
+                                           "is_group", EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP);
+
+       /* Voip Capability 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_voip_cell_data_func,
+               view, NULL);
+
+       g_object_set (cell,
+                     "visible", FALSE,
+                     NULL);
+
+       g_signal_connect (cell, "path-activated",
+                         G_CALLBACK (contact_list_view_voip_activated_cb),
+                         view);
+
+       /* Avatar */
+       cell = gtk_cell_renderer_pixbuf_new ();
+       gtk_tree_view_column_pack_start (col, cell, FALSE);
+       gtk_tree_view_column_set_cell_data_func (
+               col, cell,
+               (GtkTreeCellDataFunc) contact_list_view_avatar_cell_data_func,
+               view, NULL);
+
+       g_object_set (cell,
+                     "xpad", 0,
+                     "ypad", 0,
+                     "visible", FALSE,
+                     "width", 32,
+                     "height", 32,
+                     NULL);
+
+       /* Expander */
+       cell = empathy_cell_renderer_expander_new ();
+       gtk_tree_view_column_pack_end (col, cell, FALSE);
+       gtk_tree_view_column_set_cell_data_func (
+               col, cell,
+               (GtkTreeCellDataFunc) contact_list_view_expander_cell_data_func,
+               view, NULL);
+
+       /* Actually add the column now we have added all cell renderers */
+       gtk_tree_view_append_column (GTK_TREE_VIEW (view), col);
+
+       /* Drag & Drop. */
+       for (i = 0; i < G_N_ELEMENTS (drag_types_dest); ++i) {
+               drag_atoms_dest[i] = gdk_atom_intern (drag_types_dest[i].target,
+                                                     FALSE);
+       }
+
+       for (i = 0; i < G_N_ELEMENTS (drag_types_source); ++i) {
+               drag_atoms_source[i] = gdk_atom_intern (drag_types_source[i].target,
+                                                       FALSE);
+       }
+}
+
+static void
+contact_list_view_set_list_features (EmpathyContactListView         *view,
+                                    EmpathyContactListFeatureFlags  features)
+{
+       EmpathyContactListViewPriv *priv = GET_PRIV (view);
+       gboolean                    has_tooltip;
+
+       g_return_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view));
+
+       priv->list_features = features;
+
+       /* Update DnD source/dest */
+       if (features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DRAG) {
+               gtk_drag_source_set (GTK_WIDGET (view),
+                                    GDK_BUTTON1_MASK,
+                                    drag_types_source,
+                                    G_N_ELEMENTS (drag_types_source),
+                                    GDK_ACTION_MOVE | GDK_ACTION_COPY);
+       } else {
+               gtk_drag_source_unset (GTK_WIDGET (view));
+
+       }
+
+       if (features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DROP) {
+               gtk_drag_dest_set (GTK_WIDGET (view),
+                                  GTK_DEST_DEFAULT_ALL,
+                                  drag_types_dest,
+                                  G_N_ELEMENTS (drag_types_dest),
+                                  GDK_ACTION_MOVE | GDK_ACTION_COPY);
+       } else {
+               /* FIXME: URI could still be droped depending on FT feature */
+               gtk_drag_dest_unset (GTK_WIDGET (view));
+       }
+
+       /* Update has-tooltip */
+       has_tooltip = (features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_TOOLTIP) != 0;
+       gtk_widget_set_has_tooltip (GTK_WIDGET (view), has_tooltip);
+}
+
+static void
+contact_list_view_finalize (GObject *object)
+{
+       EmpathyContactListViewPriv *priv;
+
+       priv = GET_PRIV (object);
+
+       if (priv->store) {
+               g_object_unref (priv->store);
+       }
+
+       G_OBJECT_CLASS (empathy_contact_list_view_parent_class)->finalize (object);
+}
+
+static void
+contact_list_view_get_property (GObject    *object,
+                               guint       param_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
+{
+       EmpathyContactListViewPriv *priv;
+
+       priv = GET_PRIV (object);
+
+       switch (param_id) {
+       case PROP_STORE:
+               g_value_set_object (value, priv->store);
+               break;
+       case PROP_LIST_FEATURES:
+               g_value_set_flags (value, priv->list_features);
+               break;
+       case PROP_CONTACT_FEATURES:
+               g_value_set_flags (value, priv->contact_features);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+               break;
+       };
+}
+
+static void
+contact_list_view_set_property (GObject      *object,
+                               guint         param_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+       EmpathyContactListView     *view = EMPATHY_CONTACT_LIST_VIEW (object);
+       EmpathyContactListViewPriv *priv = GET_PRIV (object);
+
+       switch (param_id) {
+       case PROP_STORE:
+               priv->store = g_value_dup_object (value);
+               contact_list_view_setup (view);
+               break;
+       case PROP_LIST_FEATURES:
+               contact_list_view_set_list_features (view, g_value_get_flags (value));
+               break;
+       case PROP_CONTACT_FEATURES:
+               priv->contact_features = g_value_get_flags (value);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+               break;
+       };
 }
 
-static GtkWidget *
-contact_list_view_get_contact_menu (EmpathyContactListView *view,
-                                   gboolean               can_send_file,
-                                   gboolean               can_show_log,
-                                   gboolean               can_voip)
+static void
+empathy_contact_list_view_class_init (EmpathyContactListViewClass *klass)
 {
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       GtkAction                  *action;
-
-       if (!(priv->features & (EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CHAT |
-                               EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CALL |
-                               EMPATHY_CONTACT_LIST_FEATURE_CONTACT_LOG |
-                               EMPATHY_CONTACT_LIST_FEATURE_CONTACT_FT |
-                               EMPATHY_CONTACT_LIST_FEATURE_CONTACT_INVITE |
-                               EMPATHY_CONTACT_LIST_FEATURE_CONTACT_EDIT |
-                               EMPATHY_CONTACT_LIST_FEATURE_CONTACT_INFO |
-                               EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE))) {
-               return NULL;
-       }
+       GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+       GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-       /* Sort out sensitive/visible items */
-       action = gtk_ui_manager_get_action (priv->ui, "/Contact/Chat");
-       gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CHAT);
+       object_class->finalize = contact_list_view_finalize;
+       object_class->get_property = contact_list_view_get_property;
+       object_class->set_property = contact_list_view_set_property;
 
-#ifdef HAVE_VOIP
-       action = gtk_ui_manager_get_action (priv->ui, "/Contact/Call");
-       gtk_action_set_sensitive (action, can_voip);
-       gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CALL);
-#endif
+       widget_class->drag_data_received = contact_list_view_drag_data_received;
+       widget_class->drag_drop          = contact_list_view_drag_drop;
+       widget_class->drag_begin         = contact_list_view_drag_begin;
+       widget_class->drag_data_get      = contact_list_view_drag_data_get;
+       widget_class->drag_end           = contact_list_view_drag_end;
+       /* FIXME: noticed but when you drag the row over the treeview
+        * fast, it seems to stop redrawing itself, if we don't
+        * connect this signal, all is fine.
+        */
+       widget_class->drag_motion        = contact_list_view_drag_motion;
 
-       action = gtk_ui_manager_get_action (priv->ui, "/Contact/Log");
-       gtk_action_set_sensitive (action, can_show_log);
-       gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_LOG);
+       signals[DRAG_CONTACT_RECEIVED] =
+               g_signal_new ("drag-contact-received",
+                             G_OBJECT_CLASS_TYPE (klass),
+                             G_SIGNAL_RUN_LAST,
+                             0,
+                             NULL, NULL,
+                             _empathy_gtk_marshal_VOID__OBJECT_STRING_STRING,
+                             G_TYPE_NONE,
+                             3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_STRING);
 
+       g_object_class_install_property (object_class,
+                                        PROP_STORE,
+                                        g_param_spec_object ("store",
+                                                            "The store of the view",
+                                                            "The store of the view",
+                                                             EMPATHY_TYPE_CONTACT_LIST_STORE,
+                                                             G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+       g_object_class_install_property (object_class,
+                                        PROP_LIST_FEATURES,
+                                        g_param_spec_flags ("list-features",
+                                                            "Features of the view",
+                                                            "Falgs for all enabled features",
+                                                             EMPATHY_TYPE_CONTACT_LIST_FEATURE_FLAGS,
+                                                             EMPATHY_CONTACT_LIST_FEATURE_NONE,
+                                                             G_PARAM_READWRITE));
+       g_object_class_install_property (object_class,
+                                        PROP_CONTACT_FEATURES,
+                                        g_param_spec_flags ("contact-features",
+                                                            "Features of the contact menu",
+                                                            "Falgs for all enabled features for the menu",
+                                                             EMPATHY_TYPE_CONTACT_FEATURE_FLAGS,
+                                                             EMPATHY_CONTACT_FEATURE_NONE,
+                                                             G_PARAM_READWRITE));
 
-       action = gtk_ui_manager_get_action (priv->ui, "/Contact/SendFile");
-       gtk_action_set_visible (action, can_send_file && (priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_FT));
+       g_type_class_add_private (object_class, sizeof (EmpathyContactListViewPriv));
+}
 
-       action = gtk_ui_manager_get_action (priv->ui, "/Contact/Invite");
-       gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_INVITE);
+static void
+empathy_contact_list_view_init (EmpathyContactListView *view)
+{
+       EmpathyContactListViewPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (view,
+               EMPATHY_TYPE_CONTACT_LIST_VIEW, EmpathyContactListViewPriv);
 
-       action = gtk_ui_manager_get_action (priv->ui, "/Contact/Edit");
-       gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_EDIT);
+       view->priv = priv;
+       /* Get saved group states. */
+       empathy_contact_groups_get_all ();
 
-       action = gtk_ui_manager_get_action (priv->ui, "/Contact/Information");
-       gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_INFO);
+       gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (view), 
+                                             empathy_contact_list_store_row_separator_func,
+                                             NULL, NULL);
 
-       action = gtk_ui_manager_get_action (priv->ui, "/Contact/Remove");
-       gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE);
+       /* Connect to tree view signals rather than override. */
+       g_signal_connect (view, "button-press-event",
+                         G_CALLBACK (contact_list_view_button_press_event_cb),
+                         NULL);
+       g_signal_connect (view, "key-press-event",
+                         G_CALLBACK (contact_list_view_key_press_event_cb),
+                         NULL);
+       g_signal_connect (view, "row-activated",
+                         G_CALLBACK (contact_list_view_row_activated_cb),
+                         NULL);
+       g_signal_connect (view, "row-expanded",
+                         G_CALLBACK (contact_list_view_row_expand_or_collapse_cb),
+                         GINT_TO_POINTER (TRUE));
+       g_signal_connect (view, "row-collapsed",
+                         G_CALLBACK (contact_list_view_row_expand_or_collapse_cb),
+                         GINT_TO_POINTER (FALSE));
+       g_signal_connect (view, "query-tooltip",
+                         G_CALLBACK (contact_list_view_query_tooltip_cb),
+                         NULL);
+}
 
-       return gtk_ui_manager_get_widget (priv->ui, "/Contact");
+EmpathyContactListView *
+empathy_contact_list_view_new (EmpathyContactListStore        *store,
+                              EmpathyContactListFeatureFlags  list_features,
+                              EmpathyContactFeatureFlags      contact_features)
+{
+       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), NULL);
+       
+       return g_object_new (EMPATHY_TYPE_CONTACT_LIST_VIEW,
+                            "store", store,
+                            "contact-features", contact_features,
+                            "list-features", list_features,
+                            NULL);
 }
 
-GtkWidget *
-empathy_contact_list_view_get_group_menu (EmpathyContactListView *view)
+EmpathyContact *
+empathy_contact_list_view_get_selected (EmpathyContactListView *view)
 {
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       GtkAction                  *action;
+       EmpathyContactListViewPriv *priv;
+       GtkTreeSelection          *selection;
+       GtkTreeIter                iter;
+       GtkTreeModel              *model;
+       EmpathyContact             *contact;
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
 
-       if (!(priv->features & (EMPATHY_CONTACT_LIST_FEATURE_GROUPS_RENAME |
-                               EMPATHY_CONTACT_LIST_FEATURE_GROUPS_REMOVE))) {
+       priv = GET_PRIV (view);
+
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
                return NULL;
        }
 
-       action = gtk_ui_manager_get_action (priv->ui, "/Group/Rename");
-       gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_RENAME);
-
-       action = gtk_ui_manager_get_action (priv->ui, "/Group/Remove");
-       gtk_action_set_visible (action, priv->features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_REMOVE);
-
-       return gtk_ui_manager_get_widget (priv->ui, "/Group");
-}
-
-GtkWidget *
-empathy_contact_list_view_get_contact_menu (EmpathyContactListView *view,
-                                           EmpathyContact         *contact)
-{
-       EmpathyLogManager *log_manager;
-       gboolean           can_show_log;
-       gboolean           can_send_file;
-       gboolean           can_voip;
+       gtk_tree_model_get (model, &iter,
+                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
+                           -1);
 
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
-       g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
-
-       log_manager = empathy_log_manager_new ();
-       can_show_log = empathy_log_manager_exists (log_manager,
-                                                  empathy_contact_get_account (contact),
-                                                  empathy_contact_get_id (contact),
-                                                  FALSE);
-       g_object_unref (log_manager);
-       can_send_file = FALSE;
-       can_voip = empathy_contact_can_voip (contact);
-
-       return contact_list_view_get_contact_menu (view,
-                                                  can_send_file,
-                                                  can_show_log,
-                                                  can_voip);
+       return contact;
 }
 
-static gboolean
-contact_list_view_button_press_event_cb (EmpathyContactListView *view,
-                                        GdkEventButton        *event,
-                                        gpointer               user_data)
+gchar *
+empathy_contact_list_view_get_selected_group (EmpathyContactListView *view)
 {
        EmpathyContactListViewPriv *priv;
-       EmpathyContact             *contact;
-       GtkTreePath               *path;
        GtkTreeSelection          *selection;
-       GtkTreeModel              *model;
        GtkTreeIter                iter;
-       gboolean                   row_exists;
-       GtkWidget                 *menu;
+       GtkTreeModel              *model;
+       gboolean                   is_group;
+       gchar                     *name;
 
-       priv = GET_PRIV (view);
+       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
 
-       if (event->button != 3) {
-               return FALSE;
-       }
+       priv = GET_PRIV (view);
 
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-
-       gtk_widget_grab_focus (GTK_WIDGET (view));
-
-       row_exists = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (view),
-                                                   event->x, event->y,
-                                                   &path,
-                                                   NULL, NULL, NULL);
-       if (!row_exists) {
-               return FALSE;
+       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
+               return NULL;
        }
 
-       gtk_tree_selection_unselect_all (selection);
-       gtk_tree_selection_select_path (selection, path);
-
-       gtk_tree_model_get_iter (model, &iter, path);
-       gtk_tree_path_free (path);
-
        gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
+                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
+                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
                            -1);
 
-       if (contact) {
-               menu = empathy_contact_list_view_get_contact_menu (view, contact);
-               g_object_unref (contact);
-       } else {
-               menu = empathy_contact_list_view_get_group_menu (view);
-       }
-
-       if (!menu) {
-               return FALSE;
+       if (!is_group) {
+               g_free (name);
+               return NULL;
        }
 
-       gtk_widget_show (menu);
-
-       gtk_menu_popup (GTK_MENU (menu),
-                       NULL, NULL, NULL, NULL,
-                       event->button, event->time);
+       return name;
+}
 
-       return TRUE;
+static gboolean
+contact_list_view_remove_dialog_show (GtkWindow   *parent, 
+                                     const gchar *window_title, 
+                                     const gchar *text)
+{
+       GtkWidget *dialog, *label, *image, *hbox;
+       gboolean res;
+       
+       dialog = gtk_dialog_new_with_buttons (window_title, parent,
+                                             GTK_DIALOG_MODAL,
+                                             GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
+                                             GTK_STOCK_DELETE, GTK_RESPONSE_YES,
+                                             NULL);
+       gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE);
+        
+       label = gtk_label_new (text);
+       image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+        
+       hbox = gtk_hbox_new (FALSE, 5);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+       gtk_box_pack_start_defaults (GTK_BOX (hbox), image);
+       gtk_box_pack_start_defaults (GTK_BOX (hbox), label);     
+       gtk_box_pack_start_defaults (GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);
+
+       gtk_widget_show (image);
+       gtk_widget_show (label);
+       gtk_widget_show (hbox);
+       gtk_widget_show (dialog);
+        
+       res = gtk_dialog_run (GTK_DIALOG (dialog));
+       gtk_widget_destroy (dialog);
+
+       return (res == GTK_RESPONSE_YES);
 }
 
 static void
-contact_list_view_row_activated_cb (EmpathyContactListView *view,
-                                   GtkTreePath            *path,
-                                   GtkTreeViewColumn      *col,
-                                   gpointer                user_data)
+contact_list_view_group_remove_activate_cb (GtkMenuItem            *menuitem,
+                                           EmpathyContactListView *view)
 {
        EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       EmpathyContact             *contact;
-       GtkTreeModel               *model;
-       GtkTreeIter                 iter;
+       gchar                      *group;
 
-       if (!(priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CHAT)) {
-               return;
-       }
+       group = empathy_contact_list_view_get_selected_group (view);
+       if (group) {
+               gchar     *text;
+               GtkWindow *parent;
 
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
+               text = g_strdup_printf (_("Do you really want to remove the group '%s'?"), group);
+               parent = empathy_get_toplevel_window (GTK_WIDGET (view));
+               if (contact_list_view_remove_dialog_show (parent, _("Removing group"), text)) {
+                       EmpathyContactList *list;
 
-       gtk_tree_model_get_iter (model, &iter, path);
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                           -1);
+                       list = empathy_contact_list_store_get_list_iface (priv->store);
+                       empathy_contact_list_remove_group (list, group);
+               }
 
-       if (contact) {
-               empathy_chat_with_contact (contact);
-               g_object_unref (contact);
+               g_free (text);
        }
+
+       g_free (group);
 }
 
-#ifdef HAVE_VOIP
-static void
-contact_list_view_voip_activated_cb (EmpathyCellRendererActivatable *cell,
-                                    const gchar                    *path_string,
-                                    EmpathyContactListView         *view)
+GtkWidget *
+empathy_contact_list_view_get_group_menu (EmpathyContactListView *view)
 {
        EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       GtkTreeModel               *model;
-       GtkTreeIter                 iter;
-       EmpathyContact             *contact;
+       gchar                      *group;
+       GtkWidget                  *menu;
+       GtkWidget                  *item;
+       GtkWidget                  *image;
 
-       if (!(priv->features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CALL)) {
-               return;
-       }
+       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
 
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-       if (!gtk_tree_model_get_iter_from_string (model, &iter, path_string)) {
-               return;
+       if (!(priv->list_features & (EMPATHY_CONTACT_LIST_FEATURE_GROUPS_RENAME |
+                                    EMPATHY_CONTACT_LIST_FEATURE_GROUPS_REMOVE))) {
+               return NULL;
        }
 
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                           -1);
+       group = empathy_contact_list_view_get_selected_group (view);
+       if (!group) {
+               return NULL;
+       }
 
-       if (contact) {
-               contact_list_view_voip_activated (view, contact);
-               g_object_unref (contact);
+       menu = gtk_menu_new ();
+
+       /* FIXME: Not implemented yet
+       if (priv->features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_RENAME) {
+               item = gtk_menu_item_new_with_mnemonic (_("Re_name"));
+               gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+               gtk_widget_show (item);
+               g_signal_connect (item, "activate",
+                                 G_CALLBACK (contact_list_view_group_rename_activate_cb),
+                                 view);
+       }*/
+
+       if (priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_REMOVE) {
+               item = gtk_image_menu_item_new_with_mnemonic (_("_Remove"));
+               image = gtk_image_new_from_icon_name (GTK_STOCK_REMOVE,
+                                                     GTK_ICON_SIZE_MENU);
+               gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+               gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+               gtk_widget_show (item);
+               g_signal_connect (item, "activate",
+                                 G_CALLBACK (contact_list_view_group_remove_activate_cb),
+                                 view);
        }
-}
-#endif
 
+       g_free (group);
+
+       return menu;
+}
 
 static void
-contact_list_view_row_expand_or_collapse_cb (EmpathyContactListView *view,
-                                            GtkTreeIter           *iter,
-                                            GtkTreePath           *path,
-                                            gpointer               user_data)
+contact_list_view_remove_activate_cb (GtkMenuItem            *menuitem,
+                                     EmpathyContactListView *view)
 {
        EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       GtkTreeModel               *model;
-       gchar                      *name;
-       gboolean                    expanded;
-
-       if (!(priv->features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_SAVE)) {
-               return;
-       }
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-                           -1);
+       EmpathyContact             *contact;
+               
+       contact = empathy_contact_list_view_get_selected (view);
 
-       expanded = GPOINTER_TO_INT (user_data);
-       empathy_contact_group_set_expanded (name, expanded);
+       if (contact) {
+               gchar     *text; 
+               GtkWindow *parent;
+
+               parent = empathy_get_toplevel_window (GTK_WIDGET (view));
+               text = g_strdup_printf (_("Do you really want to remove the contact '%s'?"),
+                                       empathy_contact_get_name (contact));                                            
+               if (contact_list_view_remove_dialog_show (parent, _("Removing contact"), text)) {
+                       EmpathyContactList *list;
+
+                       list = empathy_contact_list_store_get_list_iface (priv->store);
+                       empathy_contact_list_remove (list, contact, 
+                               _("Sorry, I don't want you in my contact list anymore."));
+               }
 
-       g_free (name);
+               g_free (text);
+               g_object_unref (contact);
+       }
 }
 
-static void
-contact_list_view_action_cb (GtkAction             *action,
-                            EmpathyContactListView *view)
+GtkWidget *
+empathy_contact_list_view_get_contact_menu (EmpathyContactListView *view)
 {
-       EmpathyContactListViewPriv *priv;
+       EmpathyContactListViewPriv *priv = GET_PRIV (view);
        EmpathyContact             *contact;
-       const gchar               *name;
-       gchar                     *group;
-       GtkWindow                 *parent;
+       GtkWidget                  *menu;
+       GtkWidget                  *item;
+       GtkWidget                  *image;
 
-       priv = GET_PRIV (view);
+       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
 
-       name = gtk_action_get_name (action);
-       if (!name) {
-               return;
+       contact = empathy_contact_list_view_get_selected (view);
+       if (!contact) {
+               return NULL;
        }
 
-       empathy_debug (DEBUG_DOMAIN, "Action:'%s' activated", name);
+       menu = empathy_contact_menu_new (contact, priv->contact_features);
 
-       contact = empathy_contact_list_view_get_selected (view);
-       group = empathy_contact_list_view_get_selected_group (view);
-       parent = empathy_get_toplevel_window (GTK_WIDGET (view));
-
-       if (contact && strcmp (name, "Chat") == 0) {
-               empathy_chat_with_contact (contact);
-       }
-       else if (contact && strcmp (name, "Call") == 0) {
-               contact_list_view_voip_activated (view, contact);
-       }
-       else if (contact && strcmp (name, "Information") == 0) {
-               empathy_contact_information_dialog_show (contact, parent, FALSE, FALSE);
-       }
-       else if (contact && strcmp (name, "Edit") == 0) {
-               empathy_contact_information_dialog_show (contact, parent, TRUE, FALSE);
+       if (!(priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE)) {
+               g_object_unref (contact);
+               return menu;
        }
-       else if (contact && strcmp (name, "Remove") == 0) {
-               /* FIXME: Ask for confirmation */
-               EmpathyContactList *list;
 
-               list = empathy_contact_list_store_get_list_iface (priv->store);
-               empathy_contact_list_remove (list, contact,
-                                            _("Sorry, I don't want you in my contact list anymore."));
-       }
-       else if (contact && strcmp (name, "Invite") == 0) {
-       }
-       else if (contact && strcmp (name, "SendFile") == 0) {
-       }
-       else if (contact && strcmp (name, "Log") == 0) {
-               empathy_log_window_show (empathy_contact_get_account (contact),
-                                       empathy_contact_get_id (contact),
-                                       FALSE,
-                                       parent);
-       }
-       else if (group && strcmp (name, "Rename") == 0) {
+       if (menu) {
+               /* Separator */
+               item = gtk_separator_menu_item_new ();
+               gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+               gtk_widget_show (item);
+       } else {
+               menu = gtk_menu_new ();
        }
-       else if (group && strcmp (name, "Remove") == 0) {
-               EmpathyContactList *list;
 
-               list = empathy_contact_list_store_get_list_iface (priv->store);
-               empathy_contact_list_remove_group (list, group);
+       /* Remove contact */
+       if (priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE) {
+               item = gtk_image_menu_item_new_with_mnemonic (_("_Remove"));
+               image = gtk_image_new_from_icon_name (GTK_STOCK_REMOVE,
+                                                     GTK_ICON_SIZE_MENU);
+               gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+               gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+               gtk_widget_show (item);
+               g_signal_connect (item, "activate",
+                                 G_CALLBACK (contact_list_view_remove_activate_cb),
+                                 view);
        }
 
-       g_free (group);
-       if (contact) {
-               g_object_unref (contact);
-       }
-}
+       g_object_unref (contact);
 
-static void
-contact_list_view_voip_activated (EmpathyContactListView *view,
-                                 EmpathyContact         *contact)
-{
-       empathy_call_with_contact (contact);
+       return menu;
 }