talons

commit dc3bee87f1be9e88f1f5143042858d950dd5f323
parent 13cf6899435fcb480438a8f48d8983119e172820
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Thu, 15 Mar 2012 15:33:13 +0000

2012-03-15 [pawel]	3.8.0cvs33

	* src/messageview.c
	* src/textview.c
		- Make separate window info more accurate about
		move to trash/deletion.
		- Fix busy cursor

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/messageview.c
 | 
4
+++-
M
src/textview.c
 | 
1
+

5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-15 [pawel]	3.8.0cvs33
+
+	* src/messageview.c
+	* src/textview.c
+		- Make separate window info more accurate about
+		move to trash/deletion.
+		- Fix busy cursor
+
 2012-03-14 [pawel]	3.8.0cvs32
 
 	* src/folder.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4349,3 +4349,4 @@
 ( cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/gtk/gtkcmctree.c;  ) > 3.8.0cvs30.patchset
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.76 -r 1.1.2.77 src/gtk/authors.h;  cvs diff -u -r 1.100.2.81 -r 1.100.2.82 AUTHORS;  ) > 3.8.0cvs31.patchset
 ( cvs diff -u -r 1.213.2.205 -r 1.213.2.206 src/folder.c;  cvs diff -u -r 1.94.2.228 -r 1.94.2.229 src/messageview.c;  cvs diff -u -r 1.19.2.28 -r 1.19.2.29 src/messageview.h;  cvs diff -u -r 1.60.2.59 -r 1.60.2.60 src/procmsg.h;  cvs diff -u -r 1.395.2.444 -r 1.395.2.445 src/summaryview.c;  cvs diff -u -r 1.96.2.237 -r 1.96.2.238 src/textview.c;  cvs diff -u -r 1.12.2.29 -r 1.12.2.30 src/textview.h;  ) > 3.8.0cvs32.patchset
+( cvs diff -u -r 1.94.2.229 -r 1.94.2.230 src/messageview.c;  cvs diff -u -r 1.96.2.238 -r 1.96.2.239 src/textview.c;  ) > 3.8.0cvs33.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/messageview.c b/src/messageview.c
@@ -2895,7 +2895,9 @@ static gboolean messageview_update_msg(gpointer source, gpointer data)
 			if (!prefs_common.always_show_msg) {
 				messageview_clear(messageview);
 				textview_show_info(messageview->mimeview->textview,
-					_("\n  Message has been deleted"));
+					MSG_IS_DELETED(old_msginfo->flags) ?
+					_("\n  Message has been deleted") :
+					_("\n  Message has been moved to trash"));
 			} else
 				messageview->update_needed = TRUE;
 
diff --git a/src/textview.c b/src/textview.c
@@ -877,6 +877,7 @@ void textview_show_info(TextView *textview, const gchar *info_str)
 
 	TEXTVIEW_INSERT(info_str);
 	textview_show_icon(textview, GTK_STOCK_DIALOG_INFO);
+	textview_cursor_normal(textview);
 }
 
 void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)