aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/addressbook/autocompletion-config.c5
-rw-r--r--modules/mail/em-mailer-prefs.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index 370c1a1e7e..1ce9e707fa 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -30,6 +30,7 @@
#include <libedataserverui/e-source-selector.h>
#include <libedataserverui/e-name-selector-entry.h>
+#include "e-util/e-datetime-format.h"
#include "widgets/misc/e-preferences-window.h"
static void
@@ -129,9 +130,9 @@ autocompletion_config_init (EShell *shell)
e_preferences_window_add_page (
E_PREFERENCES_WINDOW (preferences_window),
- "autocompletion",
+ "contacts",
"preferences-autocompletion",
- _("Autocompletion"),
+ _("Contacts"),
scrolled_window,
200);
}
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index d9ec9e751b..e2c956e0ff 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -41,6 +41,7 @@
#include "libedataserverui/e-cell-renderer-color.h"
#include "e-util/e-binding.h"
+#include "e-util/e-datetime-format.h"
#include "e-util/e-util-private.h"
#include "widgets/misc/e-charset-combo-box.h"
@@ -811,6 +812,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
GHashTable *default_header_hash;
GtkWidget *toplevel;
GtkWidget *container;
+ GtkWidget *table;
GtkWidget *widget;
GtkTreeSelection *selection;
GtkCellRenderer *renderer;
@@ -1133,6 +1135,11 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
g_slist_free (header_add_list);
+ /* 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:"));
+
/* Junk prefs */
widget = glade_xml_get_widget (gui, "chkCheckIncomingMail");
e_mutual_binding_new (