aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 1c06133db3..45e7d946e4 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,5 +1,11 @@
2001-09-10 Jeffrey Stedfast <fejj@ximian.com>
+ * e-msg-composer.c (setup_ui): Make sure that the session is
+ non-NULL.
+ (menu_file_send_cb): And here too.
+
+2001-09-10 Jeffrey Stedfast <fejj@ximian.com>
+
* e-msg-composer.c (build_message): Wrap the S/MIME code in ifdef
SMIME_SUPPORTED which isn't defined but by some later version will
be.
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 733fc6e363..69d63dfb93 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1396,7 +1396,7 @@ menu_file_send_cb (BonoboUIComponent *uic,
void *data,
const char *path)
{
- if (camel_session_is_online (session))
+ if (session && camel_session_is_online (session))
gtk_signal_emit (GTK_OBJECT (data), signals[SEND]);
else
gtk_signal_emit (GTK_OBJECT (data), signals[POSTPONE]);
@@ -1730,7 +1730,7 @@ setup_ui (EMsgComposer *composer)
composer);
g_free (default_charset);
- if (!camel_session_is_online (session)) {
+ if (!session || !camel_session_is_online (session)) {
/* Move the accelerator from Send to Send Later */
bonobo_ui_component_set_prop (
composer->uic, "/commands/FileSend",