Merge lp:~rodrigo-moya/ubuntuone-client/fix-614047 into lp:ubuntuone-client

[Rodrigo Moya]

Draw a separator between recently used contacts and the rest

Draw a separator between recently used contacts and the rest

[Roman Yepishev (rye)]

How can this be tested?

review: Needs Information (fieldtest)

[Rodrigo Moya (rodrigo-moya)]

> How can this be tested?

Run nautilus/test-contacts-picker, select some contacts and press OK. Then run it again, and see the contacts you previously selected displayed at the top, and then a separator and then the rest of the contacts in alphabetical order

[Roman Yepishev (rye)]

I see the separator :)
http://ubuntuone.com/p/Ehd/

review: Approve (fieldtest)

[Manuel de la Peña (mandel)]

+1 I got a new separator :D

review: Approve

=== modified file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2010-07-20 15:10:34 +0000
+++ nautilus/contacts-view.c	2010-09-01 15:04:40 +0000
@@ -38,6 +38,7 @@
 #define CONTACTS_VIEW_COLUMN_MARKUP 1
 #define CONTACTS_VIEW_COLUMN_EMAIL  2
 #define CONTACTS_VIEW_COLUMN_PIXBUF 3
+#define CONTACTS_VIEW_COLUMN_RECENT 4
 
 typedef struct {
 	gchar *name;
@@ -200,6 +201,7 @@
 	EContactPhoto *photo = NULL;
 	GtkTreeModel *model;
 	GdkPixbuf *pixbuf;
+	gboolean new_is_recent;
 
 	/* Get the pixbuf for this contact */
 	if (contact != NULL) {
@@ -250,6 +252,8 @@
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (cv->contacts_list));
 #endif
 
+	new_is_recent = g_hash_table_lookup (cv->recently_used, name) != NULL;
+
 	if (gtk_tree_model_get_iter_first (model, &current_row)) {
 		gchar *current_name;
 		gboolean added = FALSE;
@@ -261,13 +265,12 @@
 #endif
 
 		do {
-			gboolean new_is_recent, current_is_recent, insert_before = FALSE;
+			gboolean current_is_recent, insert_before = FALSE;
 
 			gtk_tree_model_get (model, &current_row,
 					    CONTACTS_VIEW_COLUMN_NAME, &current_name,
 					    -1);
 
-			new_is_recent = g_hash_table_lookup (cv->recently_used, name) != NULL;
 			current_is_recent = g_hash_table_lookup (cv->recently_used, current_name) != NULL;
 
 			if (g_hash_table_lookup (selection_hash, current_name) != NULL)
@@ -300,6 +303,7 @@
 			    CONTACTS_VIEW_COLUMN_MARKUP, markedup_name,
 			    CONTACTS_VIEW_COLUMN_EMAIL, email,
 			    CONTACTS_VIEW_COLUMN_PIXBUF, pixbuf,
+			    CONTACTS_VIEW_COLUMN_RECENT, new_is_recent,
 			    -1);
 }
 
@@ -386,6 +390,7 @@
 			    CONTACTS_VIEW_COLUMN_MARKUP, contact_markedup_name,
 			    CONTACTS_VIEW_COLUMN_EMAIL, contact_email,
 			    CONTACTS_VIEW_COLUMN_PIXBUF, pixbuf,
+			    CONTACTS_VIEW_COLUMN_RECENT, TRUE,
 			    -1);
 
 #ifdef BUILD_GRID_VIEW
@@ -493,6 +498,38 @@
 	}
 }
 
+static gboolean
+row_separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
+{
+	gboolean current_is_recent, other_is_recent;
+	GtkTreePath *path;
+	gboolean result = FALSE;
+	ContactsView *cv = CONTACTS_VIEW (user_data);
+
+	gtk_tree_model_get (model, iter,
+			    CONTACTS_VIEW_COLUMN_RECENT, &current_is_recent,
+			    -1);
+
+	path = gtk_tree_model_get_path (model, iter);
+	if (path != NULL) {
+		if (gtk_tree_path_prev (path)) {
+			GtkTreeIter previous;
+
+			if (gtk_tree_model_get_iter (model, &previous, path)) {
+				gtk_tree_model_get (model, &previous,
+						    CONTACTS_VIEW_COLUMN_RECENT, &other_is_recent,
+						    -1);
+				if (other_is_recent && !current_is_recent)
+					result = TRUE;
+			}
+		}
+
+		gtk_tree_path_free (path);
+	}
+
+	return result;
+}
+
 static void
 contacts_view_init (ContactsView *cv)
 {
@@ -524,7 +561,12 @@
 					GTK_POLICY_AUTOMATIC);
 
 	/* Create the contacts list */
-	model = GTK_TREE_MODEL (gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, NULL));
+	model = GTK_TREE_MODEL (gtk_list_store_new (5, G_TYPE_STRING,
+						    G_TYPE_STRING,
+						    G_TYPE_STRING,
+						    GDK_TYPE_PIXBUF,
+						    G_TYPE_BOOLEAN,
+						    NULL));
 
 #ifdef BUILD_GRID_VIEW
 	cv->contacts_list = gtk_icon_view_new_with_model (model);
@@ -538,6 +580,9 @@
 			  G_CALLBACK (selection_changed_cb), cv);
 #else
 	cv->contacts_list = gtk_tree_view_new_with_model (model);
+	gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (cv->contacts_list),
+					      (GtkTreeViewRowSeparatorFunc) row_separator_func,
+					      cv, NULL);
 	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (cv->contacts_list), FALSE);
 	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cv->contacts_list), -1,
 						     "Avatar",