diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-11-05 21:53:05 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2009-11-05 21:53:05 +0800 |
| commit | c79efd6590bfabecd3a31c2a30d1ddb9a55349e4 (patch) | |
| tree | 0eed30a3489a4689428a590d5759d44a0f81fd76 /modules | |
| parent | df1f9b3b33de886c5b9a63b0ee6e722bfea4b2e0 (diff) | |
| download | gsoc2013-evolution-c79efd6590bfabecd3a31c2a30d1ddb9a55349e4.tar gsoc2013-evolution-c79efd6590bfabecd3a31c2a30d1ddb9a55349e4.tar.gz gsoc2013-evolution-c79efd6590bfabecd3a31c2a30d1ddb9a55349e4.tar.bz2 gsoc2013-evolution-c79efd6590bfabecd3a31c2a30d1ddb9a55349e4.tar.lz gsoc2013-evolution-c79efd6590bfabecd3a31c2a30d1ddb9a55349e4.tar.xz gsoc2013-evolution-c79efd6590bfabecd3a31c2a30d1ddb9a55349e4.tar.zst gsoc2013-evolution-c79efd6590bfabecd3a31c2a30d1ddb9a55349e4.zip | |
Bug #597582 - Original Date: header should be given precedence
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mail/e-mail-shell-settings.c | 4 | ||||
| -rw-r--r-- | modules/mail/em-mailer-prefs.c | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c index c20f57ce43..1434951b81 100644 --- a/modules/mail/e-mail-shell-settings.c +++ b/modules/mail/e-mail-shell-settings.c @@ -151,6 +151,10 @@ e_mail_shell_settings_init (EShell *shell) "/apps/evolution/mail/display/photo_local"); e_shell_settings_install_property_for_key ( + "mail-show-real-date", + "/apps/evolution/mail/display/show_real_date"); + + e_shell_settings_install_property_for_key ( "mail-prompt-delete-in-vfolder", "/apps/evolution/mail/prompts/delete_in_vfolder"); diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index f27ec7d04a..45071a1479 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -1143,8 +1143,15 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, /* date/time format */ table = glade_xml_get_widget (gui, "datetime_format_table"); - e_datetime_format_add_setup_widget (table, 0, "mail", "header", DTFormatKindDateTime, _("Date header:")); - e_datetime_format_add_setup_widget (table, 1, "mail", "table", DTFormatKindDateTime, _("Table column:")); + + e_datetime_format_add_setup_widget (table, 2, "mail", "table", DTFormatKindDateTime, _("_Table column:")); + e_datetime_format_add_setup_widget (table, 0, "mail", "header", DTFormatKindDateTime, _("_Date header:")); + widget = gtk_check_button_new_with_mnemonic (_("Show _original header value")); + gtk_widget_show (widget); + gtk_table_attach ((GtkTable *) table, widget, 0, 3, 1, 2, GTK_EXPAND | GTK_FILL, 0, 12, 0); + e_mutual_binding_new ( + shell_settings, "mail-show-real-date", + widget, "active"); /* Junk prefs */ widget = glade_xml_get_widget (gui, "chkCheckIncomingMail"); |