2 files changed, 11 insertions, 15 deletions
diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c
index e31fa8506f..4cea4dfb86 100644
--- a/addressbook/gui/component/select-names/e-select-names-popup.c
+++ b/addressbook/gui/component/select-names/e-select-names-popup.c
@@ -41,6 +41,7 @@
 #include <addressbook/backend/ebook/e-book-util.h>
 #include <addressbook/contact-editor/e-contact-editor.h>
 #include <addressbook/contact-editor/e-contact-quick-add.h>
+#include "e-addressbook-util.h"
 #include "e-select-names-popup.h"
 
 typedef struct _PopupInfo PopupInfo;
@@ -93,23 +94,17 @@ popup_info_cleanup (GtkWidget *w, gpointer info)
 /* You are in a maze of twisty little callbacks, all alike... */
 
 static void
-found_fields_cb (EBook *book, EBookStatus status, EList *writable_fields, gpointer user_data)
-{
-	EDestination *dest = E_DESTINATION (user_data);
-	EContactEditor *ce;
-	ECard *card;
-
-	card = (ECard *) e_destination_get_card (dest);
-	ce = e_contact_editor_new (card, FALSE, writable_fields, FALSE);
-	e_contact_editor_raise (ce);
-	gtk_object_unref (GTK_OBJECT (dest));
-}
-
-static void
 edit_contact_info_have_book_cb (EBook *book, gpointer user_data)
 {
 	if (book) {
-		e_book_get_supported_fields (book, found_fields_cb, user_data);
+		EDestination *dest = E_DESTINATION (user_data);
+		EContactEditor *ce;
+		ECard *card;
+
+		card = (ECard *) e_destination_get_card (dest);
+		ce = e_addressbook_show_contact_editor (book, card, FALSE, TRUE);
+		e_contact_editor_raise (ce);
+		gtk_object_unref (GTK_OBJECT (dest));
 	}
 }
 
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c
index 6aa6a75a9a..c9d1d1177f 100644
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-text-model.c
@@ -18,6 +18,7 @@
 
 #include <addressbook/contact-editor/e-contact-editor.h>
 #include "e-select-names-text-model.h"
+#include "e-addressbook-util.h"
 
 static FILE *out = NULL; /* stream for debugging spew */
 
@@ -714,7 +715,7 @@ e_select_names_text_model_activate_obj (ETextModel *model, gint n)
 	g_return_if_fail (card);
 	
 	/* present read-only contact editor when someone double clicks from here */
-	contact_editor = e_contact_editor_new ((ECard *) card, FALSE, NULL, TRUE);
+	contact_editor = e_addressbook_show_contact_editor (NULL, card, FALSE, FALSE);
 	e_contact_editor_raise (contact_editor);
 }