aboutsummaryrefslogtreecommitdiffstats
path: root/modules/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'modules/addressbook')
-rw-r--r--modules/addressbook/apps_evolution_addressbook.schemas.in12
-rw-r--r--modules/addressbook/autocompletion-config.c12
-rw-r--r--modules/addressbook/e-book-shell-backend.c8
-rw-r--r--modules/addressbook/e-book-shell-settings.c4
4 files changed, 32 insertions, 4 deletions
diff --git a/modules/addressbook/apps_evolution_addressbook.schemas.in b/modules/addressbook/apps_evolution_addressbook.schemas.in
index a6506d7a78..cf9f098e90 100644
--- a/modules/addressbook/apps_evolution_addressbook.schemas.in
+++ b/modules/addressbook/apps_evolution_addressbook.schemas.in
@@ -139,5 +139,17 @@
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/evolution/addressbook/display/address_formatting</key>
+ <applyto>/apps/evolution/addressbook/display/address_formatting</applyto>
+ <owner>evolution-addressbook</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Enable address formatting</short>
+ <long>Whether addresses should be formatted according to standard in their destination country.</long>
+ </locale>
+ </schema>
+
</schemalist>
</gconfschemafile>
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index 020ad1dc81..be9ddcc427 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -194,6 +194,18 @@ acc_get_general_page (EConfig *ec,
DTFormatKindDateTime, _("_Table column:"));
gtk_widget_show (widget);
+ itembox = add_section (vbox, _("Address formatting"), FALSE);
+
+ widget = gtk_check_button_new_with_label (
+ _("_Format address according to standard of its destination country"));
+ g_object_bind_property (
+ shell_settings, "enable-address-formatting",
+ widget, "active",
+ G_BINDING_BIDIRECTIONAL |
+ G_BINDING_SYNC_CREATE);
+ gtk_box_pack_start (GTK_BOX (itembox), widget, FALSE, FALSE, 0);
+ gtk_widget_show (widget);
+
itembox = add_section (vbox, _("Autocompletion"), TRUE);
widget = gtk_check_button_new_with_mnemonic (
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index c52b39b9fa..92341e4a3f 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -440,8 +440,8 @@ book_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
}
static void
-book_shell_backend_window_created_cb (EShellBackend *shell_backend,
- GtkWindow *window)
+book_shell_backend_window_added_cb (EShellBackend *shell_backend,
+ GtkWindow *window)
{
const gchar *backend_name;
@@ -525,8 +525,8 @@ book_shell_backend_constructed (GObject *object)
shell_backend);
g_signal_connect_swapped (
- shell, "window-created",
- G_CALLBACK (book_shell_backend_window_created_cb),
+ shell, "window-added",
+ G_CALLBACK (book_shell_backend_window_added_cb),
shell_backend);
e_book_shell_backend_init_settings (shell);
diff --git a/modules/addressbook/e-book-shell-settings.c b/modules/addressbook/e-book-shell-settings.c
index 6be121d2c2..ae2e4f0adf 100644
--- a/modules/addressbook/e-book-shell-settings.c
+++ b/modules/addressbook/e-book-shell-settings.c
@@ -35,4 +35,8 @@ e_book_shell_backend_init_settings (EShell *shell)
e_shell_settings_install_property_for_key (
"book-primary-selection",
"/apps/evolution/addressbook/display/primary_addressbook");
+
+ e_shell_settings_install_property_for_key (
+ "enable-address-formatting",
+ "/apps/evolution/addressbook/display/address_formatting");
}