4 files changed, 5 insertions, 16 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 254af85207..9c1e553400 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -34,6 +34,7 @@ libecontacteditor_la_LIBADD =						\
 	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
 	$(top_builddir)/widgets/menus/libmenus.la			\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 28b5b636fe..9ad6fc0612 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -2302,26 +2302,16 @@ set_address_label (EContact *contact,
 {
 	gchar *address_label = NULL;
 	gboolean format_address;
-	GConfClient *client;
-	GConfValue *value;
+	GSettings *settings;
 
 	if (!address) {
 		e_contact_set (contact, field, NULL);
 		return;
 	}
 
-
-	client = gconf_client_get_default ();
-	value = gconf_client_get (client,
-		"/apps/evolution/addressbook/display/address_formatting", NULL);
-	g_object_unref (client);
-
-	if (value) {
-		format_address = gconf_value_get_bool (value);
-		gconf_value_free (value);
-	} else {
-		format_address = TRUE;
-	}
+	settings = g_settings_new ("org.gnome.evolution.addressbook");
+	format_address = g_settings_get_boolean (settings, "address-formatting");
+	g_object_unref (settings);
 
 	if (format_address) {
 		address_label = eab_format_address (contact,
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 3595437f28..75ac692f3f 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -473,7 +473,6 @@ build_quick_add_dialog (QuickAdd *qa)
 		gconf_client, "/apps/evolution/addressbook/sources");
 	source = e_source_list_peek_default_source (qa->source_list);
 	g_object_unref (gconf_client);
-
 	qa->combo_box = e_source_combo_box_new (qa->source_list);
 	e_source_combo_box_set_active (
 		E_SOURCE_COMBO_BOX (qa->combo_box), source);
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 231a14281c..b936c9810d 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -833,7 +833,6 @@ eab_contact_locate_match_full (EBookClient *book_client,
 		return;
 
 	source = e_source_list_peek_default_source (info->source_list);
-
 	e_client_utils_open_new (
 		source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
 		e_client_utils_authenticate_handler, NULL,