2006-02-22 [wwp] 2.0.0cvs70

	* src/compose.c
		fix a crash when redirecting (for instance) when compose window's
		toolbar contents has been customized (when some buttons have been
		removed in fact).

diff --git a/ChangeLog b/ChangeLog
index 2a2ff198f4332e7285ba586780b6c574a4b071e6..d8bc3b0e1b2638e3609d5f4b1b558e2861d39385 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-22 [wwp]       2.0.0cvs70
+
+       * src/compose.c
+               fix a crash when redirecting (for instance) when compose window's
+               toolbar contents has been customized (when some buttons have been
+               removed in fact).
+
 2006-02-21 [wwp]       2.0.0cvs69
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 38a6e791c45c8f77dedfa1e6bce402ffed10eeaa..c71d5a04cf83aca36f896d8b1a270e7965e19039 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1253,3 +1253,4 @@
 ( cvs diff -u -r 1.274.2.97 -r 1.274.2.98 src/mainwindow.c;  ) > 2.0.0cvs67.patchset
 ( cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/gtkutils.c;  ) > 2.0.0cvs68.patchset
 ( cvs diff -u -r 1.395.2.172 -r 1.395.2.173 src/summaryview.c;  cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.0.0cvs69.patchset
+( cvs diff -u -r 1.382.2.243 -r 1.382.2.244 src/compose.c;  ) > 2.0.0cvs70.patchset

diff --git a/configure.ac b/configure.ac
index b209c4959902378c0ccc25de7e0034876b84761b..d7891d98e747e6d21b572e9bd6d7bbca96279a98 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=69
+EXTRA_VERSION=70
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index d54ec742eb903138eed86ad3602aad9db6bee160..41f373dc1516655b138d40c755ea6fb433641c6d 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1755,10 +1755,14 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
        gtk_widget_set_sensitive(compose->toolbar->draft_btn, FALSE);
        gtk_widget_set_sensitive(compose->toolbar->insert_btn, FALSE);
        gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
+       if (compose->toolbar->sig_btn)
+               gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
+       if (compose->toolbar->exteditor_btn)
+               gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
+       if (compose->toolbar->linewrap_current_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
+       if (compose->toolbar->linewrap_all_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
 
        compose->modified = FALSE;
        compose_set_title(compose);
@@ -6896,10 +6900,14 @@ static void compose_set_ext_editor_sensitive(Compose *compose,
        gtk_widget_set_sensitive(compose->toolbar->sendl_btn,     sensitive);
        gtk_widget_set_sensitive(compose->toolbar->draft_btn,     sensitive);
        gtk_widget_set_sensitive(compose->toolbar->insert_btn,    sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->sig_btn,       sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn,  sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn,  sensitive);
+       if (compose->toolbar->sig_btn)
+               gtk_widget_set_sensitive(compose->toolbar->sig_btn,   ensitive);
+       if (compose->toolbar->exteditor_btn)
+               gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
+       if (compose->toolbar->linewrap_current_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
+       if (compose->toolbar->linewrap_all_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
 }
 #endif /* G_OS_UNIX */