Merge lp:~rodrigo-moya/ubuntuone-client/scroll-when-searching-contacts into lp:ubuntuone-client

[Rodrigo Moya]

Scroll contacts view when searching

Scroll contacts view when searching

[Natalia Bidart (nataliabidart)]

The code looks ok, though I can not test it locally.

review: Approve

[John Lenton (chipaca)]

It works for me :)
Naty, to test it manually, copy the .so's over the system ones. Yeah, yeah, not a brilliant solution.

review: Approve

=== modified file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2010-07-13 15:19:43 +0000
+++ nautilus/contacts-view.c	2010-07-15 10:19:42 +0000
@@ -252,6 +252,12 @@
 		gchar *current_name;
 		gboolean added = FALSE;
 
+#ifdef BUILD_GRID_VIEW
+		gtk_icon_view_scroll_to_path (GTK_ICON_VIEW (cv->contacts_list),
+					      gtk_tree_model_get_path (GTK_TREE_MODEL (model), &current_row),
+					      TRUE, 0.0, 0.0);
+#endif
+
 		do {
 			gboolean new_is_recent, current_is_recent, insert_before = FALSE;
 
@@ -600,11 +606,12 @@
 		g_hash_table_insert (tmp_selection, g_strdup (old_sci->name), new_sci);
 	}
 
-	/* Reset the icon views */
+	/* Reset the contact views */
 #ifdef BUILD_GRID_VIEW
 	model = gtk_icon_view_get_model (GTK_ICON_VIEW (cv->contacts_list));
 #else
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (cv->contacts_list));
+	gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (cv->contacts_list), 0, 0);
 #endif
 	gtk_list_store_clear (GTK_LIST_STORE (model));
 	cv->matched_contacts = 0;