aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-09-18 04:20:32 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-09-18 04:20:32 +0800
commit190d2b0b7ff8c6fef285354ef369c7e8075c76e4 (patch)
tree7b7f1297dedabc541b42a958e3ed9ca9f2ccf6ec /mail
parent97d6f614ac165f2a8022c425aa1803c043d95be4 (diff)
downloadgsoc2013-evolution-190d2b0b7ff8c6fef285354ef369c7e8075c76e4.tar.gz
gsoc2013-evolution-190d2b0b7ff8c6fef285354ef369c7e8075c76e4.tar.zst
gsoc2013-evolution-190d2b0b7ff8c6fef285354ef369c7e8075c76e4.zip
Use e_strftime_fix_am_pm here which fixes locale issues as well as working
2002-09-17 Jeffrey Stedfast <fejj@ximian.com> * mail-display.c (mail_display_render): Use e_strftime_fix_am_pm here which fixes locale issues as well as working around systems that don't support %P (afaik). * mail-ops.c (prep_offline_do): Cache important messages too. svn path=/trunk/; revision=18095
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/component-factory.c2
-rw-r--r--mail/mail-display.c2
-rw-r--r--mail/mail-ops.c2
4 files changed, 9 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4761538e2c..03127fd54f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,11 @@
2002-09-17 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-display.c (mail_display_render): Use e_strftime_fix_am_pm
+ here which fixes locale issues as well as working around systems
+ that don't support %P (afaik).
+
+ * mail-ops.c (prep_offline_do): Cache important messages too.
+
* mail-composer-prefs.c (d): Disable debugging printf's
* mail-ops.c: fixed a comment
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 3251a618f6..a7aa0fa8a4 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -948,7 +948,7 @@ send_receive_cb (EvolutionShellComponent *shell_component,
FolderBrowser, and then we will be able to call configure_mail from
here properly. */
if (!mail_config_is_configured () /* && !configure_mail (fb) */)
- return;
+ return;
account = mail_config_get_default_account ();
if (!account || !account->transport) {
diff --git a/mail/mail-display.c b/mail/mail-display.c
index f6e6123d9a..4376f9b643 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -1763,7 +1763,7 @@ mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll)
localtime_r (&target_date, &due);
- e_strftime (due_date, sizeof (due_date), _("by %B %d, %Y, %l:%M %P"), &due);
+ e_strftime_fix_am_pm (due_date, sizeof (due_date), _("by %B %d, %Y, %l:%M %P"), &due);
} else {
snprintf (due_date, sizeof (due_date), "%s", _("at your earliest convenience"));
}
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 705785eac4..45d8c33864 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -2143,7 +2143,7 @@ static void prep_offline_do(struct _mail_msg *mm)
if (folder) {
if (CAMEL_IS_DISCO_FOLDER(folder)) {
camel_disco_folder_prepare_for_offline((CamelDiscoFolder *)folder,
- "(match-all (not (system-flag \"Seen\")))",
+ "(match-all (or (not (system-flag \"Seen\")) (system-flag \"Flagged\")))",
&mm->ex);
}
/* prepare_for_offline should do this? */