2007-01-06 [colin] 2.6.1cvs112

	* src/messageview.c
		Don't try to show a message if updating
		Maybe fixes bug 1088, 'ctrl-h produces
		repeatable crash'.

diff --git a/ChangeLog b/ChangeLog
index 93a128e6a8824ae471b4cc6377b8749474a78d2f..373b6d9b35a8b48dcefa6c0952eb4306ccbb791d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-06 [colin]     2.6.1cvs112
+
+       * src/messageview.c
+               Don't try to show a message if updating
+               Maybe fixes bug 1088, 'ctrl-h produces
+               repeatable crash'.
+
 2007-01-06 [colin]     2.6.1cvs111
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 012310943d1e62180ae56a9829bfe4c231d5fba6..c44365b0b1fd7dd608a06dacb983bc89cb39166b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2219,3 +2219,4 @@
 ( cvs diff -u -r 1.274.2.159 -r 1.274.2.160 src/mainwindow.c;  ) > 2.6.1cvs109.patchset
 ( cvs diff -u -r 1.179.2.145 -r 1.179.2.146 src/imap.c;  cvs diff -u -r 1.16.2.48 -r 1.16.2.49 src/msgcache.c;  ) > 2.6.1cvs110.patchset
 ( cvs diff -u -r 1.395.2.273 -r 1.395.2.274 src/summaryview.c;  ) > 2.6.1cvs111.patchset
+( cvs diff -u -r 1.94.2.115 -r 1.94.2.116 src/messageview.c;  ) > 2.6.1cvs112.patchset

diff --git a/configure.ac b/configure.ac
index 404badec96ffc1063120941e05bb9bdf8b1131e3..bd4dbb5831d5492ae9fcc911e82d20c919e09e6a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=111
+EXTRA_VERSION=112
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/messageview.c b/src/messageview.c
index 0da8d7e7649bf009011c29f6914486df0df63c8c..11673465bf67c568ae060cf7cefa5f904369bd74 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -773,6 +773,9 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                messageview->mimeview->textview->stop_loading = TRUE;
                return 0;
        }
+       if (messageview->updating)
+               return 0;
+
        if (messageview->toolbar)
                toolbar_set_learn_button
                        (messageview->toolbar,