diff options
Diffstat (limited to 'addressbook/gui/contact-editor')
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 18 |
2 files changed, 5 insertions, 14 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, |