Merge branch 'people-nearby-fake-group-613558'

[empathy.git] / libempathy-gtk / empathy-contact-list-view.c

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 2a3fb773e0f3155a4dc21dc5deeeb288c9cb23c2..05823435a04727f9b9d42f501b5477156e38a733 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -94,6 +94,7 @@ enum DndDragType {
 };
 
 static const GtkTargetEntry drag_types_dest[] = {
+       { "text/path-list",  0, DND_DRAG_TYPE_URI_LIST },
        { "text/uri-list",   0, DND_DRAG_TYPE_URI_LIST },
        { "text/contact-id", 0, DND_DRAG_TYPE_CONTACT_ID },
        { "text/plain",      0, DND_DRAG_TYPE_STRING },
@@ -101,6 +102,7 @@ static const GtkTargetEntry drag_types_dest[] = {
 };
 
 static const GtkTargetEntry drag_types_dest_file[] = {
+       { "text/path-list",  0, DND_DRAG_TYPE_URI_LIST },
        { "text/uri-list",   0, DND_DRAG_TYPE_URI_LIST },
 };
 
@@ -238,6 +240,21 @@ contact_list_view_drag_got_contact (EmpathyTpContactFactory *factory,
                data->old_group, data->new_group);
 
        list = empathy_contact_list_store_get_list_iface (priv->store);
+
+       if (!tp_strdiff (data->new_group, EMPATHY_CONTACT_LIST_STORE_FAVORITE)) {
+               /* Mark contact as favourite */
+               empathy_contact_list_add_to_favourites (list, contact);
+               return;
+       }
+
+       if (!tp_strdiff (data->old_group, EMPATHY_CONTACT_LIST_STORE_FAVORITE)) {
+               /* Remove contact as favourite */
+               empathy_contact_list_remove_from_favourites (list, contact);
+               /* Don't try to remove it */
+               g_free (data->old_group);
+               data->old_group = NULL;
+       }
+
        if (data->new_group) {
                empathy_contact_list_add_to_group (list, contact, data->new_group);
        }
@@ -246,6 +263,27 @@ contact_list_view_drag_got_contact (EmpathyTpContactFactory *factory,
        }
 }
 
+static gboolean
+group_can_be_modified (const gchar *name,
+                      gboolean is_fake_group,
+                      gboolean adding)
+{
+       /* Real groups can always be modified */
+       if (!is_fake_group)
+               return TRUE;
+
+       /* The favorite fake group can be modified so users can
+        * add/remove favorites using DnD */
+       if (!tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_FAVORITE))
+               return TRUE;
+
+       /* We can remove contacts from the 'ungrouped' fake group */
+       if (!adding && !tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_UNGROUPED))
+               return TRUE;
+
+       return FALSE;
+}
+
 static gboolean
 contact_list_view_contact_drag_received (GtkWidget         *view,
                                         GdkDragContext    *context,
@@ -266,23 +304,30 @@ contact_list_view_contact_drag_received (GtkWidget         *view,
        gchar         *new_group = NULL;
        gchar         *old_group = NULL;
        gboolean       success = TRUE;
+       gboolean       new_group_is_fake, old_group_is_fake = TRUE;
 
        priv = GET_PRIV (view);
 
        sel_data = (const gchar *) gtk_selection_data_get_data (selection);
        new_group = empathy_contact_list_store_get_parent_group (model,
-                                                                path, NULL);
+                                                                path, NULL, &new_group_is_fake);
+
+       if (!group_can_be_modified (new_group, new_group_is_fake, TRUE))
+               return FALSE;
 
        /* Get source group information. */
        if (priv->drag_row) {
                source_path = gtk_tree_row_reference_get_path (priv->drag_row);
                if (source_path) {
                        old_group = empathy_contact_list_store_get_parent_group (
-                                                                                model, source_path, NULL);
+                                                                                model, source_path, NULL, &old_group_is_fake);
                        gtk_tree_path_free (source_path);
                }
        }
 
+       if (!group_can_be_modified (old_group, old_group_is_fake, FALSE))
+               return FALSE;
+
        if (!tp_strdiff (old_group, new_group)) {
                g_free (new_group);
                g_free (old_group);
@@ -897,11 +942,14 @@ contact_list_view_group_icon_cell_data_func (GtkTreeViewColumn     *tree_column,
        if (!is_group)
                goto out;
 
-       if (tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_FAVORITE))
-               goto out;
-
-       pixbuf = empathy_pixbuf_from_icon_name ("emblem-favorite",
-               GTK_ICON_SIZE_MENU);
+       if (!tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_FAVORITE)) {
+               pixbuf = empathy_pixbuf_from_icon_name ("emblem-favorite",
+                       GTK_ICON_SIZE_MENU);
+       }
+       else if (!tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_PEOPLE_NEARBY)) {
+               pixbuf = empathy_pixbuf_from_icon_name ("im-local-xmpp",
+                       GTK_ICON_SIZE_MENU);
+       }
 
 out:
        g_object_set (cell,
@@ -982,22 +1030,12 @@ contact_list_view_text_cell_data_func (GtkTreeViewColumn     *tree_column,
 {
        gboolean is_group;
        gboolean is_active;
-       gboolean show_status;
-       gchar *name;
 
        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_STATUS_VISIBLE, &show_status,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
                            -1);
 
-       g_object_set (cell,
-                     "show-status", show_status,
-                     "text", name,
-                     NULL);
-       g_free (name);
-
        contact_list_view_cell_set_background (view, cell, is_group, is_active);
 }
 
@@ -1178,10 +1216,16 @@ contact_list_view_setup (EmpathyContactListView *view)
 
        gtk_tree_view_column_add_attribute (col, cell,
                                            "name", EMPATHY_CONTACT_LIST_STORE_COL_NAME);
+       gtk_tree_view_column_add_attribute (col, cell,
+                                           "text", EMPATHY_CONTACT_LIST_STORE_COL_NAME);
+       gtk_tree_view_column_add_attribute (col, cell,
+                                           "presence-type", EMPATHY_CONTACT_LIST_STORE_COL_PRESENCE_TYPE);
        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);
+       gtk_tree_view_column_add_attribute (col, cell,
+                                           "compact", EMPATHY_CONTACT_LIST_STORE_COL_COMPACT);
 
        /* Audio Call Icon */
        cell = empathy_cell_renderer_activatable_new ();