commit db3e89224746b94333dd6dea0745df904dcfe711
parent cc0645915208a6e488b36331d3fef66d3a06695e
Author: Tristan Chabredier <wwp@claws-mail.org>
Date: Tue, 26 Feb 2013 15:37:36 +0000
2013-02-26 [wwp] 3.9.0cvs103
* src/messageview.c
Fix wrong message, as message could have been moved to another folder
and not trashed (it could have also be deleted without staying in trash,
but that's a piece of detail, and while we're at it, the message could also
have vanished into another dimension or be now part of the twilight zone
but we should not always tell the truth to users. At last, and to be
exhaustive, the message could have disappeared because of a technical
issue which doesn't imply user action and none of the above mentions. One
would say that the message could also have never existed, but it's another
story).
Diffstat:
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+2013-02-26 [wwp] 3.9.0cvs103
+
+ * src/messageview.c
+ Fix wrong message, as message could have been moved to another folder
+ and not trashed (it could have also be deleted without staying in trash,
+ but that's a piece of detail, and while we're at it, the message could also
+ have vanished into another dimension or be now part of the twilight zone
+ but we should not always tell the truth to users. At last, and to be
+ exhaustive, the message could have disappeared because of a technical
+ issue which doesn't imply user action and none of the above mentions. One
+ would say that the message could also have never existed, but it's another
+ story).
+
2013-02-24 [colin] 3.9.0cvs102
* src/plugins/vcalendar/libical/libical/Makefile.am
diff --git a/PATCHSETS b/PATCHSETS
@@ -4600,3 +4600,4 @@
( cvs diff -u -r 1.100.2.89 -r 1.100.2.90 AUTHORS; cvs diff -u -r 1.1.2.84 -r 1.1.2.85 src/gtk/authors.h; cvs diff -u -r 1.395.2.461 -r 1.395.2.462 src/summaryview.c; ) > 3.9.0cvs100.patchset
( cvs diff -u -r 1.83.2.196 -r 1.83.2.197 src/mimeview.c; ) > 3.9.0cvs101.patchset
( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src//plugins/vcalendar/libical/libical/Makefile.am; ) > 3.9.0cvs102.patchset
+( cvs diff -u -r 1.94.2.242 -r 1.94.2.243 src/messageview.c; ) > 3.9.0cvs103.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=102
+EXTRA_VERSION=103
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/messageview.c b/src/messageview.c
@@ -2963,7 +2963,7 @@ static gboolean messageview_update_msg(gpointer source, gpointer data)
textview_show_info(messageview->mimeview->textview,
MSG_IS_DELETED(old_msginfo->flags) ?
_("\n Message has been deleted") :
- _("\n Message has been moved to trash"));
+ _("\n Message has been deleted or moved to another folder"));
} else
messageview->update_needed = TRUE;
