Merge lp:~dobey/ubuntuone-client-gnome/no-more-eds into lp:ubuntuone-client-gnome

[dobey]

Remove usage of libebook and e-d-s for contact lookup.
Use a simple entry field for sharing to e-mail addresses.

This updates the Nautilus extension to no longer have the large contact picker that was empty for most people, and removes the usage of e-d-s for contacts lookup, as the new version in 12.10 has broken API/ABI compatibility. Instead, there is now a simple entry for entering one or more e-mail addresses (using comma separation of course).

In testing this branch, I discovered a crash in libsyncdaemon when entering multiple e-mail addresses, and so to share with multiple addresses successfully, lp:~dobey/ubuntuone-client/fix-1043868 will also be needed.

A screen shot of this change is at http://ubuntuone.com/4SPMPsP5FysA55FQK5MU8V

[Roberto Alsina (ralsina)]

Design suggests changing the text to "Email addresses, comma separated" so users know what to enter.

review: Needs Fixing

[Roberto Alsina (ralsina)]

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-05-24 18:41:26 +0000
+++ configure.ac	2012-08-30 19:02:18 +0000
@@ -62,7 +62,7 @@
 fi
 AM_CONDITIONAL([HAVE_NAUTILUS_30], [test "x$have_nautilus_30" = "xyes"])
 
-PKG_CHECK_MODULES(NAUTILUS, [libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 $NAUTILUS_GCONF_DEP])
+PKG_CHECK_MODULES(NAUTILUS, [libnautilus-extension >= 2.6.0 libsyncdaemon-1.0 >= 1.7 $NAUTILUS_GCONF_DEP])
 AC_SUBST(NAUTILUS_CFLAGS)
 AC_SUBST(NAUTILUS_LIBS)
 

=== modified file 'nautilus/Makefile.am'
--- nautilus/Makefile.am	2012-02-20 16:45:35 +0000
+++ nautilus/Makefile.am	2012-08-30 19:02:18 +0000
@@ -33,21 +33,13 @@
 ubuntuone-nautilus.c: ubuntuone-marshallers.h
 
 libnautilus_ubuntuone_la_SOURCES =	\
-	add-contact-dialog.c	\
-	add-contact-dialog.h	\
-	contacts-view.c		\
-	contacts-view.h		\
 	context-menu.c		\
 	context-menu.h		\
 	error-dialog.c		\
 	file-watcher.c		\
 	file-watcher.h		\
-	highlight.c 		\
-	highlight.h 		\
 	share-dialog.c		\
 	share-dialog.h		\
-	u1-contacts-picker.c	\
-	u1-contacts-picker.h	\
 	ubuntuone-marshallers.c \
 	ubuntuone-marshallers.h	\
 	ubuntuone-nautilus.c	\
@@ -59,29 +51,6 @@
 	$(DBUS_LIBS)			\
 	$(NAUTILUS_LIBS)
 
-noinst_PROGRAMS = test-contacts-picker test-highlight
-
-test_contacts_picker_CFLAGS =		\
-	$(NAUTILUS_CFLAGS)
-test_contacts_picker_SOURCES = 	\
-	test-contacts-picker.c	\
-	add-contact-dialog.c	\
-	add-contact-dialog.h	\
-	contacts-view.c		\
-	contacts-view.h		\
-	highlight.c \
-	highlight.h \
-	u1-contacts-picker.c	\
-	u1-contacts-picker.h
-test_contacts_picker_LDADD =  $(NAUTILUS_LIBS)
-
-test_highlight_CFLAGS = $(NAUTILUS_CFLAGS)
-test_highlight_SOURCES = \
-	highlight.c \
-	highlight.h \
-	test-highlight.c
-test_highlight_LDADD = $(NAUTILUS_LIBS)
-
 EXTRA_DIST = \
 	$(gschema_in_files) \
 	ubuntuone-marshallers.list

=== removed file 'nautilus/add-contact-dialog.c'
--- nautilus/add-contact-dialog.c	2011-07-20 20:44:39 +0000
+++ nautilus/add-contact-dialog.c	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <string.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib/gi18n-lib.h>
-#include "add-contact-dialog.h"
-
-G_DEFINE_TYPE(AddContactDialog, add_contact_dialog, GTK_TYPE_DIALOG)
-
-static void
-add_contact_dialog_finalize (GObject *object)
-{
-	G_OBJECT_CLASS (add_contact_dialog_parent_class)->finalize (object);
-}
-
-static void
-add_contact_dialog_class_init (AddContactDialogClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = add_contact_dialog_finalize;
-}
-
-static void
-entry_changed_cb (GtkEditable *entry, gpointer user_data)
-{
-	const gchar *text_name, *text_email;
-	AddContactDialog *dialog = (AddContactDialog *) user_data;
-
-	text_name = gtk_entry_get_text (GTK_ENTRY (dialog->name_entry));
-	text_email = gtk_entry_get_text (GTK_ENTRY (dialog->email_entry));
-	if (strlen (text_name) > 0 && strlen (text_email) > 0)
-		gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, TRUE);
-	else
-		gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-}
-
-static void
-entry_activated_cb (GtkEntry *entry, gpointer user_data)
-{
-	const gchar *text_name, *text_email;
-	AddContactDialog *dialog = (AddContactDialog *) user_data;
-
-	text_name = gtk_entry_get_text (GTK_ENTRY (dialog->name_entry));
-	text_email = gtk_entry_get_text (GTK_ENTRY (dialog->email_entry));
-	if (strlen (text_name) > 0 && strlen (text_email) > 0)
-		gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-}
-
-static void
-add_contact_dialog_init (AddContactDialog *dialog)
-{
-	GtkWidget *table, *label;
-
-	/* Build the dialog */
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Add contact"));
-	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_ADD, GTK_RESPONSE_OK);
-
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-
-	table = gtk_table_new (2, 2, FALSE);
-	gtk_widget_show (table);
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-			    table, TRUE, TRUE, 3);
-
-	label = gtk_label_new (_("Contact name"));
-	gtk_widget_show (label);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
-
-	dialog->name_entry = gtk_entry_new ();
-	g_signal_connect (G_OBJECT (dialog->name_entry), "changed", G_CALLBACK (entry_changed_cb), dialog);
-	g_signal_connect (G_OBJECT (dialog->name_entry), "activate", G_CALLBACK (entry_activated_cb), dialog);
-	gtk_widget_show (dialog->name_entry);
-	gtk_table_attach (GTK_TABLE (table), dialog->name_entry, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
-
-	label = gtk_label_new (_("Email address"));
-	gtk_widget_show (label);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 3, 3);
-
-	dialog->email_entry = gtk_entry_new ();
-	g_signal_connect (G_OBJECT (dialog->email_entry), "changed", G_CALLBACK (entry_changed_cb), dialog);
-	g_signal_connect (G_OBJECT (dialog->email_entry), "activate", G_CALLBACK (entry_activated_cb), dialog);
-	gtk_widget_show (dialog->email_entry);
-	gtk_table_attach (GTK_TABLE (table), dialog->email_entry, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 3, 3);
-}
-
-GtkWidget *
-add_contact_dialog_new (GtkWindow *parent, const gchar *initial_text)
-{
-	AddContactDialog *dialog;
-
-	dialog = g_object_new (TYPE_ADD_CONTACT_DIALOG, NULL);
-	if (g_strrstr (initial_text, "@") != NULL)
-		gtk_entry_set_text (GTK_ENTRY (dialog->email_entry), initial_text);
-	else
-		gtk_entry_set_text (GTK_ENTRY (dialog->name_entry), initial_text);
-
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
-
-	return GTK_WIDGET (dialog);
-}
-
-const gchar *
-add_contact_dialog_get_name_text (AddContactDialog *dialog)
-{
-	return gtk_entry_get_text (GTK_ENTRY (dialog->name_entry));
-}
-
-const gchar *
-add_contact_dialog_get_email_text (AddContactDialog *dialog)
-{
-	return gtk_entry_get_text (GTK_ENTRY (dialog->email_entry));
-}

=== removed file 'nautilus/add-contact-dialog.h'
--- nautilus/add-contact-dialog.h	2011-07-20 20:44:39 +0000
+++ nautilus/add-contact-dialog.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __ADD_CONTACT_DIALOG_H__
-#define __ADD_CONTACT_DIALOG_H__
-
-#include <gtk/gtk.h>
-
-#define TYPE_ADD_CONTACT_DIALOG                (add_contact_dialog_get_type ())
-#define ADD_CONTACT_DIALOG(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ADD_CONTACT_DIALOG, AddContactDialog))
-#define IS_ADD_CONTACT_DIALOG(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ADD_CONTACT_DIALOG))
-#define ADD_CONTACT_DIALOG_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ADD_CONTACT_DIALOG, AddContactDialogClass))
-#define IS_ADD_CONTACT_DIALOG_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ADD_CONTACT_DIALOG))
-#define ADD_CONTACT_DIALOG_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ADD_CONTACT_DIALOG, AddContactDialogClass))
-
-typedef struct {
-	GtkDialog parent;
-
-	GtkWidget *name_entry;
-	GtkWidget *email_entry;
-} AddContactDialog;
-
-typedef struct {
-	GtkDialogClass parent_class;
-} AddContactDialogClass;
-
-GType        add_contact_dialog_get_type (void);
-GtkWidget   *add_contact_dialog_new (GtkWindow *parent, const gchar *initial_text);
-const gchar *add_contact_dialog_get_name_text (AddContactDialog *dialog);
-const gchar *add_contact_dialog_get_email_text (AddContactDialog *dialog);
-
-#endif

=== removed file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2011-09-23 16:01:11 +0000
+++ nautilus/contacts-view.c	1970-01-01 00:00:00 +0000
@@ -1,855 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib/gi18n-lib.h>
-#include "contacts-view.h"
-#include "highlight.h"
-
-#ifdef BUILD_GRID_VIEW
-#define AVATAR_SIZE 64
-#else
-#define AVATAR_SIZE 24
-#endif
-
-static void contacts_view_init (ContactsView *cv);
-static void contacts_view_class_init (ContactsViewClass *klass);
-
-G_DEFINE_TYPE(ContactsView, contacts_view, GTK_TYPE_SCROLLED_WINDOW)
-
-#ifdef HAVE_NAUTILUS_30
-#define SETTINGS_DOMAIN "org.gnome.nautilus.extensions.ubuntuone"
-#define SETTINGS_CONTACTS_KEY "recently-used-contacts"
-#else
-#define RECENTLY_USED_CONTACTS_KEY "/apps/libubuntuone/recently-used"
-#endif
-
-#define CONTACTS_VIEW_COLUMN_NAME   0
-#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;
-	gchar *markedup_name;
-	gchar *email;
-	GdkPixbuf *pixbuf;
-} SelectedContactInfo;
-
-enum {
-	SELECTION_CHANGED_SIGNAL,
-	CONTACTS_COUNT_CHANGED_SIGNAL,
-	LAST_SIGNAL
-};
-static guint contacts_view_signals[LAST_SIGNAL];
-
-static void
-contacts_view_finalize (GObject *object)
-{
-	ContactsView *cv = CONTACTS_VIEW (object);
-
-	if (cv->selection != NULL) {
-		g_hash_table_destroy (cv->selection);
-		cv->selection = NULL;
-	}
-
-	if (cv->recently_used != NULL) {
-		g_hash_table_destroy (cv->recently_used);
-		cv->recently_used = NULL;
-	}
-
-#ifdef HAVE_NAUTILUS_30
-	if (cv->settings != NULL) {
-		g_object_unref (G_OBJECT (cv->settings));
-		cv->settings = NULL;
-	}
-#else
-	if (cv->config_client != NULL) {
-		g_object_unref (G_OBJECT (cv->config_client));
-		cv->config_client = NULL;
-	}
-#endif
-
-	if (cv->source_list != NULL) {
-		g_object_unref (G_OBJECT (cv->source_list));
-		cv->source_list = NULL;
-	}
-
-	if (cv->added_contacts != NULL) {
-		g_hash_table_destroy (cv->added_contacts);
-		cv->added_contacts = NULL;
-	}
-
-	while (cv->books != NULL) {
-		EBook *book = (EBook *) cv->books->data;
-		cv->books = g_slist_remove (cv->books, book);
-		g_object_unref (G_OBJECT (book));
-	}
-
-	G_OBJECT_CLASS (contacts_view_parent_class)->finalize (object);
-}
-
-static void
-contacts_view_class_init (ContactsViewClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = contacts_view_finalize;
-
-	/* Signals */
-	contacts_view_signals[SELECTION_CHANGED_SIGNAL] =
-		g_signal_new ("selection-changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ContactsViewClass, selection_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE,
-			      0);
-	contacts_view_signals[CONTACTS_COUNT_CHANGED_SIGNAL] =
-		g_signal_new ("contacts-count-changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ContactsViewClass, contacts_count_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__INT,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_INT);
-}
-
-static void
-recently_used_to_list_cb (gpointer key, gpointer value, gpointer user_data)
-{
-	GSList **list = (GSList **) user_data;
-
-	*list = g_slist_append (*list, key);
-}
-
-static void
-save_recently_used_list (ContactsView *cv)
-{
-	GSList *list = NULL;
-
-	g_hash_table_foreach (cv->recently_used, (GHFunc) recently_used_to_list_cb, &list);
-
-#ifdef HAVE_NAUTILUS_30
-	{
-		gchar **strv = e_client_util_slist_to_strv (list);
-		g_settings_set_strv (cv->settings, SETTINGS_CONTACTS_KEY,
-				     (const gchar * const *) strv);
-		g_strfreev (strv);
-	}
-#else
-	gconf_client_set_list (cv->config_client, RECENTLY_USED_CONTACTS_KEY, GCONF_VALUE_STRING, list, NULL);
-#endif
-
-	g_slist_free (list);
-}
-
-static void
-selection_changed_cb (GtkWidget *view, gpointer data)
-{
-	GtkTreeModel *model;
-	GList *selected_items, *l;
-	ContactsView *cv = CONTACTS_VIEW (data);
-
-	/* We first remove all the previous selected items */
-	g_hash_table_remove_all (cv->selection);
-
-	/* Now add the new selection */
-#ifdef BUILD_GRID_VIEW
-	model = gtk_icon_view_get_model (GTK_ICON_VIEW (view));
-	selected_items = gtk_icon_view_get_selected_items (GTK_ICON_VIEW (view));
-#else
-	selected_items = gtk_tree_selection_get_selected_rows (
-		GTK_TREE_SELECTION (view),
-		&model);
-#endif
-
-	for (l = selected_items; l != NULL; l = l->next) {
-		GtkTreeIter iter;
-
-		if (gtk_tree_model_get_iter (model, &iter, (GtkTreePath *) l->data)) {
-			gchar *name, *email, *s;
-			GdkPixbuf *icon;
-			SelectedContactInfo *sci;
-
-			gtk_tree_model_get (model, &iter,
-					    CONTACTS_VIEW_COLUMN_NAME, &name,
-					    CONTACTS_VIEW_COLUMN_EMAIL, &email,
-					    CONTACTS_VIEW_COLUMN_PIXBUF, &icon,
-					    -1);
-
-			sci = g_new0 (SelectedContactInfo, 1);
-			sci->name = g_strdup (name);
-			sci->markedup_name = g_markup_escape_text (name, -1);
-			sci->email = g_strdup (email);
-			sci->pixbuf = g_object_ref (icon);
-			g_hash_table_insert (cv->selection, g_strdup (name), sci);
-
-			/* Add it to the recently used list */
-			s = g_strdup (sci->name);
-			g_hash_table_insert (cv->recently_used, s, s);
-			save_recently_used_list (cv);
-		}
-	}
-
-	/* Free memory */
-	g_list_foreach (selected_items, (GFunc) gtk_tree_path_free, NULL);
-	g_list_free (selected_items);
-
-	/* Notify listeners the selection has changed */
-	g_signal_emit_by_name (cv, "selection-changed", NULL);
-}
-
-static void
-add_one_contact (ContactsView *cv,
-		 const gchar *name,
-		 const gchar *markedup_name,
-		 const gchar *email,
-		 EContact *contact,
-		 GHashTable *selection_hash)
-{
-	GtkTreeIter new_row, current_row;
-	EContactPhoto *photo = NULL;
-	GtkTreeModel *model;
-	GdkPixbuf *pixbuf;
-	gboolean new_is_recent;
-
-	/* Get the pixbuf for this contact */
-	if (contact != NULL) {
-		photo = e_contact_get (contact, E_CONTACT_PHOTO);
-		if (photo == NULL)
-			photo = e_contact_get (contact, E_CONTACT_LOGO);
-	}
-
-	if (photo) {
-		gint width, height;
-		GdkPixbufLoader *loader = gdk_pixbuf_loader_new ();
-
-		gdk_pixbuf_loader_write (loader, photo->data.inlined.data, photo->data.inlined.length, NULL);
-		gdk_pixbuf_loader_close (loader, NULL);
-		pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-
-		if (pixbuf != NULL) {
-			g_object_ref (G_OBJECT (pixbuf));
-
-			/* Scale the image if it's too big */
-			width = gdk_pixbuf_get_width (pixbuf);
-			height = gdk_pixbuf_get_height (pixbuf);
-			if (width > AVATAR_SIZE || height > AVATAR_SIZE) {
-				GdkPixbuf *scaled;
-
-				scaled = gdk_pixbuf_scale_simple ((const GdkPixbuf *) pixbuf,
-								  AVATAR_SIZE, AVATAR_SIZE, GDK_INTERP_NEAREST);
-				g_object_unref (G_OBJECT (pixbuf));
-				pixbuf = scaled;
-			}
-		} else {
-			GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
-
-			pixbuf = gtk_icon_theme_load_icon (icon_theme, "avatar-default", AVATAR_SIZE, 0, NULL);
-		}
-
-		g_object_unref (G_OBJECT (loader));
-	} else {
-		GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
-
-		pixbuf = gtk_icon_theme_load_icon (icon_theme, "avatar-default", AVATAR_SIZE, 0, NULL);
-	}
-
-	/* Add the contact to the contacts view */
-#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));
-#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;
-
-#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 current_is_recent, insert_before = FALSE;
-
-			gtk_tree_model_get (model, &current_row,
-					    CONTACTS_VIEW_COLUMN_NAME, &current_name,
-					    -1);
-
-			current_is_recent = g_hash_table_lookup (cv->recently_used, current_name) != NULL;
-
-			if (g_hash_table_lookup (selection_hash, current_name) != NULL)
-				continue;
-			else if (new_is_recent) {
-				if (current_is_recent) {
-					if (g_ascii_strcasecmp (name, (const gchar *) current_name) < 0)
-						insert_before = TRUE;
-				} else
-					insert_before = TRUE;
-			} else if (!current_is_recent &&
-				   g_ascii_strcasecmp (name, (const gchar *) current_name) < 0)
-				insert_before = TRUE;
-
-			if (insert_before) {
-				gtk_list_store_insert_before (GTK_LIST_STORE (model), &new_row, &current_row);
-				added = TRUE;
-
-				break;
-			}
-		} while (gtk_tree_model_iter_next (model, &current_row));
-
-		if (!added)
-			gtk_list_store_append (GTK_LIST_STORE (model), &new_row);
-	} else
-		gtk_list_store_append (GTK_LIST_STORE (model), &new_row);
-
-	gtk_list_store_set (GTK_LIST_STORE (model), &new_row,
-			    CONTACTS_VIEW_COLUMN_NAME, name,
-			    CONTACTS_VIEW_COLUMN_MARKUP, markedup_name,
-			    CONTACTS_VIEW_COLUMN_EMAIL, email,
-			    CONTACTS_VIEW_COLUMN_PIXBUF, pixbuf,
-			    CONTACTS_VIEW_COLUMN_RECENT, new_is_recent,
-			    -1);
-}
-
-static void
-add_contacts (ContactsView *cv, GList *contacts, GHashTable *selection_hash, gchar *search_string)
-{
-	GList *l;
-	GtkTreeModel *model;
-
-	for (l = contacts; l != NULL; l = l->next) {
-		EContact *contact = l->data;
-		const gchar *email = NULL;
-		GList *emails_list, *al;
-		EContactName *contact_name;
-		gchar *full_name = NULL;
-		gchar *markedup_name = NULL;
-
-		contact_name = (EContactName *) e_contact_get (contact, E_CONTACT_NAME);
-		if (contact_name != NULL)
-			full_name = e_contact_name_to_string (contact_name);
-		else
-			full_name = e_contact_get (contact, E_CONTACT_NAME_OR_ORG);
-
-		emails_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
-		for (al = emails_list; al != NULL; al = al->next) {
-			EVCardAttribute *attr = (EVCardAttribute *) al->data;
-
-			email = e_vcard_attribute_get_value (attr);
-			if (email != NULL)
-				break;
-		}
-
-		if (full_name == NULL) {
-			if (email != NULL)
-				full_name = g_strdup (email);
-			else
-				g_warning ("Contact without name or email addresses");
-		}
-
-		markedup_name = highlight_result (search_string, full_name);
-
-		/* We add the selected items when searching, so ignore them here */
-		if (!g_hash_table_lookup (selection_hash, (gconstpointer) full_name)) {
-			if (email != NULL) {
-				add_one_contact (cv, full_name, markedup_name, email, contact, selection_hash);
-				cv->matched_contacts += 1;
-			}
-		}
-
-		g_list_foreach (emails_list, (GFunc) e_vcard_attribute_free, NULL);
-		g_list_free (emails_list);
-		e_contact_name_free (contact_name);
-		g_free (markedup_name);
-		g_free (full_name);
-	}
-
-#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));
-#endif
-
-	g_signal_emit_by_name (cv, "contacts-count-changed",
-			       gtk_tree_model_iter_n_children (model, NULL));
-}
-
-static void
-append_selected_to_model (GtkWidget *view,
-			  const gchar *contact_name,
-			  const gchar *contact_markedup_name,
-			  const gchar *contact_email,
-			  GdkPixbuf *pixbuf)
-{
-	GtkTreeIter new_row;
-	GtkListStore *model;
-
-#ifdef BUILD_GRID_VIEW
-	model = GTK_LIST_STORE (gtk_icon_view_get_model (GTK_ICON_VIEW (view)));
-#else
-	model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view)));
-#endif
-
-	gtk_list_store_prepend (model, &new_row);
-	gtk_list_store_set (model, &new_row,
-			    CONTACTS_VIEW_COLUMN_NAME, contact_name,
-			    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
-	gtk_icon_view_select_path (GTK_ICON_VIEW (view),
-				   gtk_tree_model_get_path (GTK_TREE_MODEL (model), &new_row));
-#else
-	gtk_tree_selection_select_path (
-		gtk_tree_view_get_selection (GTK_TREE_VIEW (view)),
-		gtk_tree_model_get_path (GTK_TREE_MODEL (model), &new_row));
-#endif
-}
-
-static void
-foreach_selected_to_model_cb (gpointer key, gpointer value, gpointer user_data)
-{
-	SelectedContactInfo *sci = (SelectedContactInfo *) value;
-	ContactsView *cv = CONTACTS_VIEW (user_data);
-
-	if (g_hash_table_lookup (cv->selection, sci->name) != NULL)
-		return;
-
-	append_selected_to_model (cv->contacts_list, sci->name, sci->markedup_name, sci->email, sci->pixbuf);
-}
-
-typedef struct {
-	ContactsView *cv;
-	GHashTable *selection_hash;
-	EBookQuery *query;
-	gchar *search_string;
-} GetContactsCallbackData;
-
-static void
-got_contacts_cb (EBook *book, EBookStatus status, GList *contacts, gpointer user_data)
-{
-	GetContactsCallbackData *gccd = user_data;
-
-	if (status == E_BOOK_ERROR_OK) {
-		add_contacts (gccd->cv, contacts, gccd->selection_hash, gccd->search_string);
-		if (gccd->selection_hash != gccd->cv->selection) {
-			/* If it's a separate selection, add all contacts to the views */
-			g_hash_table_foreach (gccd->selection_hash, (GHFunc) foreach_selected_to_model_cb, gccd->cv);
-			g_hash_table_unref (gccd->selection_hash);
-		}
-	} else {
-		g_warning ("Error retrieving contacts from addressbook %s: %d",
-			   e_book_get_uri (book), status);
-	}
-
-	e_book_query_unref (gccd->query);
-	g_free (gccd->search_string);
-	g_free (gccd);
-}
-
-static void
-retrieve_contacts (ContactsView *cv, EBook *book, const gchar *search_string, GHashTable *selection_hash)
-{
-	GetContactsCallbackData *gccd;
-
-	gccd = g_new0 (GetContactsCallbackData, 1);
-	gccd->cv = cv;
-	gccd->query = e_book_query_any_field_contains (search_string);
-	gccd->search_string = g_strdup (search_string);
-	if (selection_hash == cv->selection)
-		gccd->selection_hash = selection_hash;
-	else
-		gccd->selection_hash = g_hash_table_ref (selection_hash);
-
-	e_book_async_get_contacts (book, gccd->query, (EBookListCallback) got_contacts_cb, gccd);
-}
-
-static void
-book_opened_cb (EBook *book, EBookStatus status, gpointer user_data)
-{
-	ContactsView *cv = CONTACTS_VIEW (user_data);
-
-	if (status != E_BOOK_ERROR_OK) {
-		g_warning ("Error opening addressbook %s: %d", e_book_get_uri (book), status);
-		g_object_unref (G_OBJECT (book));
-		return;
-	}
-
-	/* Add the book to the list of opened books */
-	cv->books = g_slist_append (cv->books, book);
-
-	/* Get all contacts for this book */
-	retrieve_contacts (cv, book, "", cv->selection);
-}
-
-static void
-free_selected_contact_info (gpointer data)
-{
-	SelectedContactInfo *sci = (SelectedContactInfo *) data;
-
-	if (sci != NULL) {
-		if (sci->name != NULL)
-			g_free (sci->name);
-		if (sci->markedup_name != NULL)
-			g_free (sci->markedup_name);
-		if (sci->email != NULL)
-			g_free (sci->email);
-		if (sci->pixbuf != NULL)
-			g_object_unref (sci->pixbuf);
-
-		g_free (sci);
-	}
-}
-
-static gboolean
-row_separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
-{
-	gboolean current_is_recent, other_is_recent;
-	GtkTreePath *path;
-	gboolean result = FALSE;
-
-	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)
-{
-	GtkTreeModel *model;
-	GError *error = NULL;
-	GSList *gl;
-
-	cv->matched_contacts = 0;
-	cv->selection = g_hash_table_new_full (g_str_hash, g_str_equal,
-					       (GDestroyNotify) g_free,
-					       (GDestroyNotify) free_selected_contact_info);
-	cv->added_contacts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-
-	/* Get recently used contacts */
-	cv->recently_used = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
-
-#ifdef HAVE_NAUTILUS_30
-	cv->settings = g_settings_new (SETTINGS_DOMAIN);
-	{
-		gchar **strv;
-
-		strv = g_settings_get_strv (cv->settings, SETTINGS_CONTACTS_KEY);
-		gl = e_client_util_strv_to_slist ((const gchar * const *) strv);
-		g_strfreev (strv);
-	}	
-#else
-	cv->config_client = gconf_client_get_default ();
-	gl = gconf_client_get_list (cv->config_client, RECENTLY_USED_CONTACTS_KEY, GCONF_VALUE_STRING, NULL);
-#endif
-	for (; gl != NULL; gl = gl->next) {
-		g_hash_table_insert (cv->recently_used, g_strdup (gl->data), g_strdup (gl->data));
-	}
-	g_slist_free (gl);
-
-	/* Set up the scrolled window */
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (cv),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-
-	/* Create the contacts list */
-	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);
-	gtk_icon_view_set_text_column (GTK_ICON_VIEW (cv->contacts_list), CONTACTS_VIEW_COLUMN_NAME);
-	gtk_icon_view_set_markup_column (GTK_ICON_VIEW (cv->contacts_list), CONTACTS_VIEW_COLUMN_MARKUP);
-	gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (cv->contacts_list), CONTACTS_VIEW_COLUMN_PIXBUF);
-	gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (cv->contacts_list), GTK_SELECTION_MULTIPLE);
-	gtk_icon_view_set_item_width (GTK_ICON_VIEW (cv->contacts_list), 90);
-
-	g_signal_connect (G_OBJECT (cv->contacts_list), "selection-changed",
-			  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",
-						     gtk_cell_renderer_pixbuf_new (),
-						     "pixbuf", CONTACTS_VIEW_COLUMN_PIXBUF,
-						     NULL);
-	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cv->contacts_list), -1,
-						     "Name",
-						     gtk_cell_renderer_text_new (),
-						     "markup", CONTACTS_VIEW_COLUMN_MARKUP,
-						     NULL);
-	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (cv->contacts_list)),
-				     GTK_SELECTION_MULTIPLE);
-
-	g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (cv->contacts_list))), "changed",
-			  G_CALLBACK (selection_changed_cb), cv);
-#endif
-
-	gtk_widget_show (cv->contacts_list);
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (cv), cv->contacts_list);
-
-	/* Open all addressbooks */
-	if (!e_book_get_addressbooks (&cv->source_list, &error)) {
-		g_warning ("Could not get list of addressbooks: %s", error->message);
-		g_error_free (error);
-
-		return;
-	}
-
-	for (gl = e_source_list_peek_groups (cv->source_list); gl != NULL; gl = gl->next) {
-		GSList *sl;
-
-		for (sl = e_source_group_peek_sources ((ESourceGroup *) gl->data); sl != NULL; sl = sl->next) {
-			EBook *book;
-
-			error = NULL;
-
-			/* Open this addressbook asynchronously */
-			book = e_book_new ((ESource *) sl->data, &error);
-			if (book != NULL) {
-				e_book_async_open (book, FALSE, (EBookCallback) book_opened_cb, cv);
-			} else {
-				g_warning ("Could not open addressbook %s: %s", e_source_get_uri (sl->data), error->message);
-				g_error_free (error);
-			}
-		}
-	}
-}
-
-GtkWidget *
-contacts_view_new (void)
-{
-	return g_object_new (TYPE_CONTACTS_VIEW, NULL);
-}
-
-void
-contacts_view_search (ContactsView *cv, const gchar *search_string)
-{
-	GSList *l;
-	GHashTable *tmp_selection;
-	GHashTableIter hash_iter;
-	gpointer key, value;
-	GtkTreeModel *model;
-
-	/* Make a copy of the selected items before changing the models */
-	tmp_selection = g_hash_table_new_full (g_str_hash, g_str_equal,
-					       (GDestroyNotify) g_free,
-					       (GDestroyNotify) free_selected_contact_info);
-	g_hash_table_iter_init (&hash_iter, cv->selection);
-	while (g_hash_table_iter_next (&hash_iter, &key, &value)) {
-		SelectedContactInfo *new_sci, *old_sci;
-
-		old_sci = (SelectedContactInfo *) value;
-
-		new_sci = g_new0 (SelectedContactInfo, 1);
-		new_sci->name = g_strdup (old_sci->name);
-		new_sci->markedup_name = g_markup_escape_text (old_sci->name, -1);
-		new_sci->email = g_strdup (old_sci->email);
-		new_sci->pixbuf = g_object_ref (old_sci->pixbuf);
-		g_hash_table_insert (tmp_selection, g_strdup (old_sci->name), new_sci);
-	}
-
-	/* 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;
-
-	g_signal_emit_by_name (cv, "contacts-count-changed",
-			       gtk_tree_model_iter_n_children (model, NULL));
-
-	/* Traverse all books */
-	for (l = cv->books; l != NULL; l = l->next) {
-		EBook *book = E_BOOK (l->data);
-
-		if (!e_book_is_opened (book))
-			continue;
-
-		/* Cancel any pending operation before starting the new one*/
-		e_book_cancel (book, NULL);
-		retrieve_contacts (cv, book, search_string, tmp_selection);
-	}
-
-	/* If we added contacts in-memory, add them to the model now */
-	g_hash_table_iter_init (&hash_iter, cv->added_contacts);
-	while (g_hash_table_iter_next (&hash_iter, &key, &value)) {
-		gchar *markup;
-
-		/* We only add it if it's not on the other lists */
-		if (!g_hash_table_lookup (tmp_selection, key)) {
-			markup = g_markup_escape_text ((const gchar *) key, -1);
-			add_one_contact (cv, (const gchar *) key,
-					 (const gchar *) markup,
-					 (const gchar *) value,
-					 NULL, tmp_selection);
-			g_free (markup);
-		}
-	}
-
-	g_hash_table_unref (tmp_selection);
-}
-
-static void
-add_selection_to_list_cb (gpointer key, gpointer value, gpointer user_data)
-{
-	SelectedContactInfo *sci = (SelectedContactInfo *) value;
-	GSList **selection = (GSList **) user_data;
-
-	*selection = g_slist_append (*selection, g_strdup (sci->email));
-}
-
-GSList *
-contacts_view_get_selected_emails (ContactsView *cv)
-{
-	GSList *selection = NULL;
-
-	g_hash_table_foreach (cv->selection, (GHFunc) add_selection_to_list_cb, &selection);
-	return selection;
-}
-
-guint
-contacts_view_get_contacts_count (ContactsView *cv)
-{
-	GtkTreeModel *model;
-
-#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));
-#endif
-
-	return gtk_tree_model_iter_n_children (model, NULL);
-}
-
-guint
-contacts_view_get_matched_contacts_count (ContactsView *cv)
-{
-	return cv->matched_contacts;
-}
-
-void
-contacts_view_add_contact (ContactsView *cv, const gchar *contact_name, const gchar *contact_email)
-{
-	SelectedContactInfo *sci;
-	GtkIconTheme *icon_theme;
-	GSList *l;
-	gchar *s;
-	GdkPixbuf *pixbuf;
-	gboolean added = FALSE;
-
-	icon_theme = gtk_icon_theme_get_default ();
-
-	/* First add the new contact to the list of selected ones */
-	sci = g_new0 (SelectedContactInfo, 1);
-	sci->name = g_strdup (contact_name);
-	sci->markedup_name = g_markup_escape_text (contact_name, -1);
-	sci->email = g_strdup (contact_email);
-	pixbuf = gtk_icon_theme_load_icon (icon_theme, "avatar-default", AVATAR_SIZE, 0, NULL);
-	sci->pixbuf = g_object_ref (pixbuf);
-	g_hash_table_insert (cv->selection, g_strdup (contact_name), sci);
-
-	/* Add it to the recently used list */
-	s = g_strdup (sci->name);
-	g_hash_table_insert (cv->recently_used, s, s);
-	save_recently_used_list (cv);
-
-	/* And now add it to the icon views */
-	append_selected_to_model (cv->contacts_list, contact_name, sci->markedup_name, contact_email, pixbuf);
-
-	g_object_unref (pixbuf);
-
-	/* Add the contact to the CouchDB addressbook, if possible */
-	for (l = cv->books; l != NULL; l = l->next) {
-		const gchar *uri;
-
-		uri = e_book_get_uri (E_BOOK (l->data));
-		if (g_str_has_prefix (uri, "couchdb://127.0.0.1")) {
-			EContact *contact;
-			GError *error = NULL;
-
-			contact = e_contact_new ();
-			e_contact_set (contact, E_CONTACT_FULL_NAME, (gconstpointer) contact_name);
-			e_contact_set (contact, E_CONTACT_EMAIL_1, (gconstpointer) contact_email);
-
-			if (e_book_add_contact (E_BOOK (l->data), contact, &error))
-				added = TRUE;
-			else {
-				g_warning ("Could not add contact to %s: %s", uri, error->message);
-				g_error_free (error);
-			}
-
-			g_object_unref (G_OBJECT (contact));
-
-			break;
-		}
-	}
-
-	/* If the contact was not added, keep a copy of it so that it shows */
-	if (!added)
-		g_hash_table_insert (cv->added_contacts, g_strdup (contact_name), g_strdup (contact_email));
-}

=== removed file 'nautilus/contacts-view.h'
--- nautilus/contacts-view.h	2011-09-23 15:31:01 +0000
+++ nautilus/contacts-view.h	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __CONTACTS_VIEW_H__
-#define __CONTACTS_VIEW_H__
-
-#include <gtk/gtk.h>
-#include <libedataserver/e-source-list.h>
-#include <libebook/e-book.h>
-#ifdef HAVE_NAUTILUS_30
-#include <gio/gio.h>
-#include <libedataserver/e-client.h>
-#else
-#include <gconf/gconf-client.h>
-#endif
-
-#define TYPE_CONTACTS_VIEW                (contacts_view_get_type ())
-#define CONTACTS_VIEW(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTACTS_VIEW, ContactsView))
-#define IS_CONTACTS_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONTACTS_VIEW))
-#define CONTACTS_VIEW_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONTACTS_VIEW, ContactsViewClass))
-#define IS_CONTACTS_VIEW_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONTACTS_VIEW))
-#define CONTACTS_VIEW_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONTACTS_VIEW, ContactsViewClass))
-
-typedef struct {
-	GtkScrolledWindow parent;
-
-#ifdef HAVE_NAUTILUS_30
-	GSettings *settings;
-#else
-	GConfClient *config_client;
-#endif
-
-	/* Data from addressbooks */
-	ESourceList *source_list;
-	GSList *books;
-	GHashTable *selection;
-	GHashTable *recently_used;
-	GHashTable *added_contacts;
-
-	/* Widgets */
-	GtkWidget *contacts_list;
-
-	guint matched_contacts;
-} ContactsView;
-
-typedef struct {
-	GtkScrolledWindowClass parent_class;
-
-	/* Signals */
-	void (* selection_changed) (ContactsView *cv);
-	void (* contacts_count_changed) (ContactsView *cv, gint total);
-} ContactsViewClass;
-
-GType      contacts_view_get_type (void);
-
-GtkWidget *contacts_view_new (void);
-void       contacts_view_search (ContactsView *cv, const gchar *search_string);
-GSList    *contacts_view_get_selected_emails (ContactsView *cv);
-guint      contacts_view_get_contacts_count (ContactsView *cv);
-guint      contacts_view_get_matched_contacts_count (ContactsView *cv);
-void       contacts_view_add_contact (ContactsView *cv, const gchar *contact_name, const gchar *contact_email);
-
-#endif

=== removed file 'nautilus/highlight.c'
--- nautilus/highlight.c	2011-07-20 20:44:39 +0000
+++ nautilus/highlight.c	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-/*
- * Ubuntu One Nautilus plugin
- *
- * Authors: Alejandro J. Cura <[e-mail]>
- *
- * Copyright 2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <string.h>
-#include <glib.h>
-
-static gint
-compare_glongs (gconstpointer a,
-	        gconstpointer b,
-		gpointer user_data)
-{
-	return (glong) a - (glong) b;
-}
-
-
-static void
-tree_of_arrays_insert (GTree *tree,
-		       gpointer key,
-		       gpointer value)
-{
-	GPtrArray *array = g_tree_lookup (tree, key);
-	if (array == NULL) {
-		array = g_ptr_array_new ();
-		g_tree_insert (tree, key, array);
-	}
-	g_ptr_array_add (array, value);
-}
-
-
-static void
-destroy_tree_array (gpointer data)
-{
-	g_ptr_array_free (data, TRUE);
-}
-
-typedef struct {
-	GString *built_string;
-	gchar *source_string;
-	gchar *source_cursor;
-} BuildResultsData;
-
-
-static void
-append_array_strings (gpointer data,
-		      gpointer user_data)
-{
-	g_string_append (user_data, data);
-}
-
-
-static gboolean
-build_results (gpointer key,
-	       gpointer value,
-	       gpointer data)
-{
-	BuildResultsData* results_data = data;
-	glong tag_start = (glong)key;
-	gchar *tag_start_ptr = g_utf8_offset_to_pointer (results_data->source_string,
-							 tag_start);
-	glong len = tag_start_ptr - results_data->source_cursor;
-
-	gchar *escaped_str = g_markup_escape_text (results_data->source_cursor,
-						   len);
-	
-	g_string_append (results_data->built_string,
-			 escaped_str);
-	g_free (escaped_str);
-	results_data->source_cursor += len;
-
-	g_ptr_array_foreach (value,
-			     append_array_strings,
-			     results_data->built_string);
-	return FALSE;
-}
-
-
-gchar *
-highlight_result(gchar *needles, gchar *haystack)
-{
-	gchar **split_needles;
-	GTree *result_parts;
-	gchar *folded_needles;
-	gchar *folded_haystack;
-	gchar **needle;
-	gchar *escaped_str;
-	BuildResultsData results_data;
-
-	folded_needles = g_utf8_casefold (needles, -1);
-	folded_haystack = g_utf8_casefold (haystack, -1);
-
-	results_data.built_string = g_string_new ("");
-	results_data.source_string = haystack;
-	results_data.source_cursor = haystack;
-
-	result_parts = g_tree_new_full (compare_glongs,
-					NULL,
-					NULL,
-					destroy_tree_array);
-	
-	split_needles = g_strsplit (folded_needles, " ", 0);
-	needle = split_needles;
-	while (*needle != NULL) {
-		gchar *search_start;
-		gchar *start_ptr;
-		glong needle_len = g_utf8_strlen (*needle, -1);
-		if (needle_len < 1) {
-			needle++;
-			continue;
-		}
-		search_start = folded_haystack;
-		start_ptr = g_strstr_len (search_start, -1, *needle);
-		while (start_ptr != NULL) {
-			glong start = g_utf8_pointer_to_offset (folded_haystack,
-								start_ptr);
-			glong end = start + g_utf8_strlen (*needle, -1);
-			tree_of_arrays_insert (result_parts,
-					       (gpointer) start,
-					       "<b>");
-			tree_of_arrays_insert (result_parts,
-					       (gpointer) end,
-					       "</b>");
-			search_start = g_utf8_next_char (start_ptr);
-			start_ptr = g_strstr_len (search_start,
-			                          -1,
-						  *needle);
-		}
-		needle++;
-	}
-	g_free (folded_needles);
-	g_free (folded_haystack);
-
-
-	g_tree_foreach (result_parts, build_results, &results_data);
-
-	escaped_str = g_markup_escape_text (results_data.source_cursor, -1);
-	g_string_append (results_data.built_string,
-			 escaped_str);
-	g_free (escaped_str);
-
-	g_tree_destroy (result_parts);
-	g_strfreev (split_needles);
-	return g_string_free (results_data.built_string,
-			      FALSE);
-}

=== removed file 'nautilus/highlight.h'
--- nautilus/highlight.h	2011-07-20 20:44:39 +0000
+++ nautilus/highlight.h	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-/*
- * Ubuntu One Nautilus plugin
- *
- * Authors: Alejandro J. Cura <[e-mail]>
- *
- * Copyright 2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef __HIGHLIGHT_H__
-#define __HIGHLIGHT_H__
-
-#include <glib.h>
-
-gchar *highlight_result(gchar *search_string, gchar *result);
-
-#endif

=== modified file 'nautilus/share-dialog.c'
--- nautilus/share-dialog.c	2011-09-21 19:19:18 +0000
+++ nautilus/share-dialog.c	2012-08-30 19:02:18 +0000
@@ -26,7 +26,6 @@
 #include <glib/gi18n-lib.h>
 #include <libsyncdaemon/libsyncdaemon.h>
 #include "share-dialog.h"
-#include "u1-contacts-picker.h"
 
 G_DEFINE_TYPE(ShareDialog, share_dialog, GTK_TYPE_DIALOG)
 
@@ -50,54 +49,45 @@
 }
 
 static void
-picker_selection_changed_cb (U1ContactsPicker *picker, gpointer user_data)
-{
-	GSList *selection;
-	GtkWidget * dialog = (GtkWidget *) user_data;
-
-	selection = u1_contacts_picker_get_selected_emails (picker);
-	if (selection != NULL) {
-		gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, TRUE);
-		u1_contacts_picker_free_selection_list (selection);
-	} else
-		gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE);
-}
-
-static void
 dialog_response_cb (GtkDialog *gtk_dialog,
-		    gint response,
-		    gpointer user_data)
+                    gint response,
+                    gpointer user_data)
 {
 	ShareDialog *dialog = SHARE_DIALOG (gtk_dialog);
 
 	switch (response) {
 	case GTK_RESPONSE_ACCEPT: {
-		GSList *emails;
-		SyncdaemonSharesInterface *interface;
-		gboolean allow_mods = FALSE;
-
-		emails = u1_contacts_picker_get_selected_emails (U1_CONTACTS_PICKER (dialog->user_picker));
-		if (emails == NULL) {
-			ubuntuone_show_error_dialog (dialog->uon,
-						     _("Error"),
-						     _("You need to select at least one contact to share this folder with"));
-
-			return;
-		}
-
-		allow_mods = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->allow_mods));
-
-		interface = SYNCDAEMON_SHARES_INTERFACE (syncdaemon_daemon_get_shares_interface (dialog->uon->syncdaemon));
-		if (interface != NULL) {
-			syncdaemon_shares_interface_create (interface,
-							    dialog->path,
-							    emails,
-							    g_path_get_basename (dialog->path),
-							    allow_mods);
-		}
- 
-		u1_contacts_picker_free_selection_list (emails);
-	}
+        const gchar *entry_data;
+
+        entry_data = gtk_entry_get_text (GTK_ENTRY (dialog->user_picker));
+        if (entry_data != NULL && strlen (entry_data) > 0) {
+            SyncdaemonSharesInterface *interface;
+            gchar **email_entries;
+            GSList *emails = NULL;
+            gboolean allow_mods = FALSE;
+            gint i;
+
+            email_entries = g_strsplit (entry_data, ",", -1);
+            for (i = 0; email_entries[i] != NULL; i++) {
+                const gchar *email = g_strstrip (email_entries[i]);
+                emails = g_slist_prepend (emails, g_strdup (email));
+            }
+            g_strfreev (email_entries);
+
+            if (emails != NULL && g_slist_length (emails) > 0) {
+                allow_mods = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->allow_mods));
+
+                interface = SYNCDAEMON_SHARES_INTERFACE (syncdaemon_daemon_get_shares_interface (dialog->uon->syncdaemon));
+                if (interface != NULL) {
+                    syncdaemon_shares_interface_create (interface,
+                                                        dialog->path,
+                                                        emails,
+                                                        g_path_get_basename (dialog->path),
+                                                        allow_mods);
+                }
+            }
+        }
+    }
 	default:
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 		break;
@@ -107,7 +97,7 @@
 static void
 share_dialog_init (ShareDialog *dialog)
 {
-	GtkWidget *area, *table;
+	GtkWidget *area, *table, *hbox, *label;
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Share on Ubuntu One"));
 	gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
@@ -116,8 +106,6 @@
 				(_("Share")), GTK_RESPONSE_ACCEPT,
 				NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
-                                       GTK_RESPONSE_ACCEPT, FALSE);
 	gtk_window_set_icon_name (GTK_WINDOW (dialog), "ubuntuone");
 	g_signal_connect (G_OBJECT (dialog), "response",
 			  G_CALLBACK (dialog_response_cb), NULL);
@@ -129,11 +117,25 @@
     gtk_box_pack_start (GTK_BOX (area), table, TRUE, TRUE, 0);
     gtk_widget_show (table);
 
-	dialog->user_picker = u1_contacts_picker_new ();
-	g_signal_connect (G_OBJECT (dialog->user_picker), "selection-changed",
-			  G_CALLBACK (picker_selection_changed_cb), dialog);
-    gtk_box_pack_start (GTK_BOX (table), dialog->user_picker, TRUE, TRUE, 0);
-	gtk_widget_show (dialog->user_picker);
+    /* entry here maybe */
+    hbox = gtk_hbox_new (FALSE, 12);
+    gtk_box_pack_start (GTK_BOX (table), hbox, FALSE, FALSE, 0);
+    gtk_widget_show (hbox);
+
+    label = gtk_label_new_with_mnemonic (_("_Email:"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    gtk_widget_show (label);
+
+    dialog->user_picker = gtk_entry_new ();
+    gtk_widget_set_tooltip_text (dialog->user_picker,
+                                 _("Type an email address to share this "
+                                   "folder with. Use a comma to separate "
+                                   "multiple addresses."));
+    gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->user_picker);
+    gtk_entry_set_activates_default (GTK_ENTRY (dialog->user_picker), TRUE);
+    gtk_box_pack_start (GTK_BOX (hbox), dialog->user_picker, TRUE, TRUE, 0);
+    gtk_widget_show (dialog->user_picker);
 
 	dialog->allow_mods = gtk_check_button_new_with_mnemonic (_("_Allow Modification"));
     /* Default to RW */
@@ -142,7 +144,7 @@
     gtk_box_pack_end (GTK_BOX (table), dialog->allow_mods, FALSE, FALSE, 0);
 	gtk_widget_show (dialog->allow_mods);
 
-	gtk_widget_set_size_request (GTK_WIDGET (dialog), 500, 450);
+	gtk_widget_set_size_request (GTK_WIDGET (dialog), 320, -1);
 }
 
 GtkWidget *

=== removed file 'nautilus/test-contacts-picker.c'
--- nautilus/test-contacts-picker.c	2011-12-12 08:54:39 +0000
+++ nautilus/test-contacts-picker.c	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "u1-contacts-picker.h"
-
-static void
-dialog_response_cb (GtkDialog *dialog, gint response_id, gpointer data)
-{
-	GtkWidget *picker = GTK_WIDGET (data);
-
-	if (response_id == GTK_RESPONSE_OK) {
-		GSList *selection, *l;
-		GtkWidget *msg_dialog;
-		GString *str = NULL;
-
-		selection = u1_contacts_picker_get_selected_emails (U1_CONTACTS_PICKER (picker));
-		for (l = selection; l != NULL; l = l->next) {
-			if (str == NULL) {
-				str = g_string_new ("Selected items:\n\t");
-				str = g_string_append (str, (const gchar *) l->data);
-			} else {
-				str = g_string_append (str, "\n\t");
-				str = g_string_append (str, (const gchar *) l->data);
-			}
-		}
-
-		u1_contacts_picker_free_selection_list (selection);
-
-		/* Display selection to the user */
-		if (str != NULL) {
-			msg_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog),
-							     0,
-							     GTK_MESSAGE_INFO,
-							     GTK_BUTTONS_OK,
-							     "%s", str->str);
-			g_string_free (str, FALSE);
-		} else {
-			msg_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog),
-							     0,
-							     GTK_MESSAGE_INFO,
-							     GTK_BUTTONS_OK,
-							     "Nothing has been selected");
-		}
-
-		gtk_dialog_run (GTK_DIALOG (msg_dialog));
-	}
-
-	gtk_main_quit ();
-}
-
-int
-main (int argc, char *argv[])
-{
-	GtkWidget *window, *picker;
-
-	gtk_init (&argc, &argv);
-	g_type_init();
-
-	/* Create the main window */
-	window = gtk_dialog_new_with_buttons ("Test contacts picker",
-					      NULL,
-					      0,
-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					      GTK_STOCK_OK, GTK_RESPONSE_OK,
-					      NULL);
-	gtk_dialog_set_default_response (GTK_DIALOG (window), GTK_RESPONSE_OK);
-
-	picker = u1_contacts_picker_new ();
-	gtk_widget_show (picker);
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), picker, TRUE, TRUE, 6);
-
-	g_signal_connect (G_OBJECT (window), "response", G_CALLBACK (dialog_response_cb), picker);
-	
-	/* Run the application */
-	gtk_widget_show (window);
-	gtk_widget_set_size_request (window, 400, 250);
-	gtk_main ();
-
-	return 0;
-}

=== removed file 'nautilus/test-highlight.c'
--- nautilus/test-highlight.c	2011-07-20 20:44:39 +0000
+++ nautilus/test-highlight.c	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-/*
- * Authors: Alejandro J. Cura <[e-mail]>
- *
- * Copyright 2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "highlight.h"
-
-#include <glib.h>
-
-#define ASSERT_HIGHLIGHT(a,b,c) \
-	ret = highlight_result (a, b); \
-	g_assert_cmpstr (ret, ==, c); \
-	g_free (ret);
-
-static void
-test_highlight_matches (void)
-{
-	gchar *ret = NULL;
-	/* match at beginning */
-	ASSERT_HIGHLIGHT ("john", "john q. public", "<b>john</b> q. public");
-
-	/* match in the middle */
-	ASSERT_HIGHLIGHT ("john", "andrew john q. public", "andrew <b>john</b> q. public");
-
-	/* no match */
-	ASSERT_HIGHLIGHT ("john", "andrew q. public", "andrew q. public");
-
-	/* double match */
-	ASSERT_HIGHLIGHT ("jo sm", "john smith", "<b>jo</b>hn <b>sm</b>ith");
-	ASSERT_HIGHLIGHT ("john", "john johnson", "<b>john</b> <b>john</b>son");
-
-	/* empty search */
-	ASSERT_HIGHLIGHT ("", "john q. public", "john q. public");
-
-	/* empty search with entities */
-	ASSERT_HIGHLIGHT ("", "john & public", "john &amp; public");
-
-	/* empty search term */
-	ASSERT_HIGHLIGHT (" ", "john q. public", "john q. public");
-
-	/* empty result */
-	ASSERT_HIGHLIGHT ("john", "", "");
-
-	/* case insensitive match */
-	ASSERT_HIGHLIGHT ("john", "John Smith", "<b>John</b> Smith");
-	ASSERT_HIGHLIGHT ("john", "Brian JOHNSON", "Brian <b>JOHN</b>SON");
-	ASSERT_HIGHLIGHT ("br jo", "Brian JOHNSON", "<b>Br</b>ian <b>JO</b>HNSON");
-
-	/* nested match */
-	ASSERT_HIGHLIGHT ("edward wa", "edward wall", "<b>ed<b>wa</b>rd</b> <b>wa</b>ll");
-
-	/* utf-8 strings */
-	ASSERT_HIGHLIGHT ("ñandÚ", "Ñandú", "<b>Ñandú</b>");
-
-	/* xml entities in the search */
-	ASSERT_HIGHLIGHT ("john &", "john sons", "<b>john</b> sons");
-
-	/* xml entities in the result */
-	ASSERT_HIGHLIGHT ("john sons", "john & sons", "<b>john</b> &amp; <b>sons</b>");
-
-	/* xml entities everywhere */
-	ASSERT_HIGHLIGHT ("john & sons", "john & sons", "<b>john</b> <b>&amp;</b> <b>sons</b>");
-
-	/* make sure the name of the entities is not highlighted */
-	ASSERT_HIGHLIGHT ("john amp sons", "john & sons", "<b>john</b> &amp; <b>sons</b>");
-}
-
-int
-main (int argc, gchar *argv[])
-{
-	g_test_init (&argc, &argv, NULL);
-
-	g_test_add_func ("/testcontacts/TestHighlightMatches", test_highlight_matches);
-
-	return g_test_run ();
-}

=== removed file 'nautilus/u1-contacts-picker.c'
--- nautilus/u1-contacts-picker.c	2011-08-19 13:36:42 +0000
+++ nautilus/u1-contacts-picker.c	1970-01-01 00:00:00 +0000
@@ -1,269 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib/gi18n-lib.h>
-#include "u1-contacts-picker.h"
-#include "add-contact-dialog.h"
-#include "contacts-view.h"
-
-struct _U1ContactsPickerPrivate {
-	GtkWidget *search_entry;
-	GtkWidget *total_label;
-	GtkWidget *contacts_view;
-
-	/* Hidden widgets to add a new contact */
-	GtkWidget *add_contact_button;
-};
-
-enum {
-	SELECTION_CHANGED_SIGNAL,
-	LAST_SIGNAL
-};
-
-static guint u1_contacts_picker_signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_TYPE(U1ContactsPicker, u1_contacts_picker, GTK_TYPE_VBOX)
-
-static void
-u1_contacts_picker_finalize (GObject *object)
-{
-	U1ContactsPicker *picker = U1_CONTACTS_PICKER (object);
-
-	if (picker->priv != NULL) {
-		g_free (picker->priv);
-		picker->priv = NULL;
-	}
-
-	G_OBJECT_CLASS (u1_contacts_picker_parent_class)->finalize (object);
-}
-
-static void
-u1_contacts_picker_class_init (U1ContactsPickerClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = u1_contacts_picker_finalize;
-
-	/* Register object signals */
-	u1_contacts_picker_signals[SELECTION_CHANGED_SIGNAL] =
-		g_signal_new ("selection-changed",
-			      G_TYPE_FROM_CLASS (klass),
-			      (GSignalFlags) G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (U1ContactsPickerClass, selection_changed),
-			      NULL,
-			      NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE,
-			      0);
-}
-
-static void
-search_activated_cb (GtkEditable *entry, gpointer data)
-{
-	const gchar *text;
-	U1ContactsPicker *picker = (U1ContactsPicker *) data;
-
-	text = gtk_entry_get_text (GTK_ENTRY (entry));
-	contacts_view_search (CONTACTS_VIEW (picker->priv->contacts_view), text);
-
-	/* If no contacts, offer the user to add it to the contacts database */
-	if (contacts_view_get_matched_contacts_count (CONTACTS_VIEW (picker->priv->contacts_view)) == 0 &&
-	    g_strrstr (text, "@") != NULL)
-		gtk_widget_show (picker->priv->add_contact_button);
-	else
-		gtk_widget_hide (picker->priv->add_contact_button);
-}
-
-static void
-view_selection_changed_cb (ContactsView *cv, gpointer user_data)
-{
-	U1ContactsPicker *picker = U1_CONTACTS_PICKER (user_data);
-
-	g_signal_emit (picker, u1_contacts_picker_signals[SELECTION_CHANGED_SIGNAL], 0);
-}
-
-static void
-contacts_count_changed_cb (ContactsView *cv, gint total, gpointer user_data)
-{
-	gchar *label;
-	U1ContactsPicker *picker = U1_CONTACTS_PICKER (user_data);
-
-	if (strlen (gtk_entry_get_text (GTK_ENTRY (picker->priv->search_entry))) > 0)
-		label = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "Found %d match", "Found %d matches", total), total);
-	else
-		label = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%d contact", "%d contacts", total), total);
-	gtk_label_set_text (GTK_LABEL (picker->priv->total_label), label);
-
-	g_free (label);
-}
-
-static void
-entry_icon_pressed_cb (GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEventButton *event, gpointer user_data)
-{
-	U1ContactsPicker *picker = U1_CONTACTS_PICKER (user_data);
-
-	if (icon_pos == GTK_ENTRY_ICON_SECONDARY)
-		gtk_entry_set_text (GTK_ENTRY (picker->priv->search_entry), "");
-}
-
-static void
-add_contact_cb (GtkButton *button, gpointer user_data)
-{
-	GtkWidget *dialog;
-	const gchar *search_text;
-	U1ContactsPicker *picker = (U1ContactsPicker *) user_data;
-
-	/* Create the dialog */
-	search_text = gtk_entry_get_text (GTK_ENTRY (picker->priv->search_entry));
-	dialog = add_contact_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (picker))), search_text);
-
-	/* Run the dialog */
-	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
-		contacts_view_add_contact (CONTACTS_VIEW (picker->priv->contacts_view),
-					   add_contact_dialog_get_name_text (ADD_CONTACT_DIALOG (dialog)),
-					   add_contact_dialog_get_email_text (ADD_CONTACT_DIALOG (dialog)));
-		gtk_entry_set_text (GTK_ENTRY (picker->priv->search_entry), "");
-	}
-
-	gtk_widget_destroy (dialog);
-	gtk_widget_hide (picker->priv->add_contact_button);
-}
-
-static void
-u1_contacts_picker_init (U1ContactsPicker *picker)
-{
-	GtkWidget *table;
-
-	picker->priv = g_new0 (U1ContactsPickerPrivate, 1);
-
-	/* Create the table to contain the layout */
-	table = gtk_table_new (4, 3, FALSE);
-	gtk_widget_show (table);
-	gtk_box_pack_start (GTK_BOX (picker), table, TRUE, TRUE, 3);
-
-	/* Create the search area */
-	picker->priv->search_entry = gtk_entry_new ();
-	gtk_entry_set_text (GTK_ENTRY (picker->priv->search_entry), _("Type here to search"));
-	gtk_entry_set_icon_from_stock (GTK_ENTRY (picker->priv->search_entry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
-	gtk_entry_set_icon_activatable (GTK_ENTRY (picker->priv->search_entry), GTK_ENTRY_ICON_PRIMARY, FALSE);
-	gtk_entry_set_icon_tooltip_text (GTK_ENTRY (picker->priv->search_entry),
-					 GTK_ENTRY_ICON_PRIMARY,
-					 _("Type here to search for contacts"));
-	gtk_entry_set_icon_from_stock (GTK_ENTRY (picker->priv->search_entry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
-	gtk_entry_set_icon_activatable (GTK_ENTRY (picker->priv->search_entry), GTK_ENTRY_ICON_SECONDARY, TRUE);
-	gtk_entry_set_icon_tooltip_text (GTK_ENTRY (picker->priv->search_entry),
-					 GTK_ENTRY_ICON_SECONDARY,
-					 _("Click here to clear the search field"));
-	g_signal_connect (G_OBJECT (picker->priv->search_entry), "icon_press",
-			  G_CALLBACK (entry_icon_pressed_cb), picker);
-	g_signal_connect (G_OBJECT (picker->priv->search_entry), "changed",
-			  G_CALLBACK (search_activated_cb), picker);
-	gtk_widget_show (picker->priv->search_entry);
-	gtk_table_attach (GTK_TABLE (table), picker->priv->search_entry, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
-
-	picker->priv->add_contact_button = gtk_button_new_from_stock (GTK_STOCK_ADD);
-	g_signal_connect (G_OBJECT (picker->priv->add_contact_button), "clicked",
-			  G_CALLBACK (add_contact_cb), picker);
-	gtk_table_attach (GTK_TABLE (table), picker->priv->add_contact_button, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
-
-	picker->priv->total_label = gtk_label_new (g_dngettext (GETTEXT_PACKAGE, "0 contact", "0 contacts", 0));
-	gtk_widget_show (picker->priv->total_label);
-	gtk_table_attach (GTK_TABLE (table), picker->priv->total_label, 2, 3, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
-
-	/* Create the contacts view */
-	picker->priv->contacts_view = contacts_view_new ();
-	g_signal_connect (G_OBJECT (picker->priv->contacts_view), "selection-changed",
-			  G_CALLBACK (view_selection_changed_cb), picker);
-	g_signal_connect (G_OBJECT (picker->priv->contacts_view), "contacts-count-changed",
-			  G_CALLBACK (contacts_count_changed_cb), picker);
-	gtk_widget_show (picker->priv->contacts_view);
-	gtk_table_attach (GTK_TABLE (table), picker->priv->contacts_view, 0, 3, 2, 4,
-			  GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-			  GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-			  3, 3);
-}
-
-/**
- * u1_contacts_picker_new:
- *
- * Create a new contacts picker widget.
- *
- * Return value: the newly created widget.
- */
-GtkWidget *
-u1_contacts_picker_new (void)
-{
-	U1ContactsPicker *picker;
-
-	picker = g_object_new (U1_TYPE_CONTACTS_PICKER, NULL);
-
-	return (GtkWidget *) picker;
-}
-
-/**
- * u1_contacts_picker_get_contacts_count:
- * @picker: A #U1ContactsPicker widget
- *
- * Return the number of contacts being displayed by the contacts picker.
- *
- * Return value: Number of contacts being displayed.
- */
-guint
-u1_contacts_picker_get_contacts_count (U1ContactsPicker *picker)
-{
-	g_return_val_if_fail (U1_IS_CONTACTS_PICKER (picker), 0);
-
-	//FIXME: return gtk_tree_model_iter_n_children (gtk_icon_view_get_model (GTK_ICON_VIEW (picker->priv->icon_view)), NULL);
-	return 0;
-}
-
-/**
- * u1_contacts_picker_get_selected_emails:
- * @picker: A #U1ContactsPicker widget
- *
- * Return the list of selected emails in the contacts picker.
- *
- * Return value: A list of strings containing the email addresses selected.
- */
-GSList *
-u1_contacts_picker_get_selected_emails (U1ContactsPicker *picker)
-{
-	g_return_val_if_fail (U1_IS_CONTACTS_PICKER (picker), NULL);
-
-	return contacts_view_get_selected_emails (CONTACTS_VIEW (picker->priv->contacts_view));
-}
-
-/**
- * u1_contacts_picker_free_selection_list:
- * @list: The list to free memory of
- *
- * Free a list returned by @u1_contacts_picker_get_selected_emails.
- */
-void
-u1_contacts_picker_free_selection_list (GSList *list)
-{
-	g_slist_foreach (list, (GFunc) g_free, NULL);
-	g_slist_free (list);
-}

=== removed file 'nautilus/u1-contacts-picker.h'
--- nautilus/u1-contacts-picker.h	2011-07-20 20:44:39 +0000
+++ nautilus/u1-contacts-picker.h	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __U1_CONTACTS_PICKER_H__
-#define __U1_CONTACTS_PICKER_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define U1_TYPE_CONTACTS_PICKER                (u1_contacts_picker_get_type ())
-#define U1_CONTACTS_PICKER(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), U1_TYPE_CONTACTS_PICKER, U1ContactsPicker))
-#define U1_IS_CONTACTS_PICKER(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), U1_TYPE_CONTACTS_PICKER))
-#define U1_CONTACTS_PICKER_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), U1_TYPE_CONTACTS_PICKER, U1ContactsPickerClass))
-#define U1_IS_CONTACTS_PICKER_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), U1_TYPE_CONTACTS_PICKER))
-#define U1_CONTACTS_PICKER_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), U1_TYPE_CONTACTS_PICKER, U1ContactsPickerClass))
-
-typedef struct _U1ContactsPicker        U1ContactsPicker;
-typedef struct _U1ContactsPickerClass   U1ContactsPickerClass;
-typedef struct _U1ContactsPickerPrivate U1ContactsPickerPrivate;
-
-struct _U1ContactsPicker {
-	GtkVBox parent;
-	U1ContactsPickerPrivate *priv;
-};
-
-struct _U1ContactsPickerClass {
-	GtkVBoxClass parent_class;
-
-	/* Signals */
-	void (* selection_changed) (U1ContactsPicker *picker);
-};
-
-GType      u1_contacts_picker_get_type (void);
-
-GtkWidget *u1_contacts_picker_new (void);
-guint      u1_contacts_picker_get_contacts_count (U1ContactsPicker *picker);
-GSList    *u1_contacts_picker_get_selected_emails (U1ContactsPicker *picker);
-void       u1_contacts_picker_free_selection_list (GSList *list);
-
-G_END_DECLS
-
-#endif

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-02-20 16:45:35 +0000
+++ po/POTFILES.in	2012-08-30 19:02:18 +0000
@@ -1,9 +1,6 @@
-nautilus/add-contact-dialog.c
 nautilus/ubuntuone-nautilus.c
-nautilus/contacts-view.c
 nautilus/context-menu.c
 nautilus/file-watcher.c
-nautilus/u1-contacts-picker.c
 nautilus/share-dialog.c
 nautilus/utils.c
 gsd/gsd-ubuntuone.c