aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@src.gnome.org>2007-08-16 15:08:08 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-08-16 15:08:08 +0800
commit73f27c89bc2085970de8ee2ec7e3366968d75065 (patch)
tree99657ce5040146a826cb45c68b4b4117dc2d3565
parentbc8218c79d949949988238961516d69b75cbec3b (diff)
downloadgsoc2013-evolution-73f27c89bc2085970de8ee2ec7e3366968d75065.tar.gz
gsoc2013-evolution-73f27c89bc2085970de8ee2ec7e3366968d75065.tar.zst
gsoc2013-evolution-73f27c89bc2085970de8ee2ec7e3366968d75065.zip
2007-08-16 mcrha Fix for bug #466548
svn path=/trunk/; revision=34010
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-composer-utils.c2
-rw-r--r--plugins/exchange-operations/ChangeLog7
-rw-r--r--plugins/exchange-operations/exchange-mail-send-options.c3
-rw-r--r--plugins/groupwise-features/ChangeLog7
-rw-r--r--plugins/groupwise-features/mail-send-options.c3
6 files changed, 28 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 44dd91a430..6c47451d97 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-16 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #466548
+
+ * em-composer-utils.c: (em_utils_composer_send_cb):
+ e_msg_composer_get_preferred_account can return NULL, so test for it.
+
2007-08-13 Milan Crha <mcrha@redhat.com>
** Fix for bug #352346
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 5a6d9dbd8f..dc7c8c541a 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -414,7 +414,7 @@ em_utils_composer_send_cb (EMsgComposer *composer, gpointer user_data)
EAccount *account;
account = e_msg_composer_get_preferred_account (composer);
- if (!account->enabled) {
+ if (!account || !account->enabled) {
e_error_run((GtkWindow *)composer, "mail:send-no-account-enabled", NULL);
return;
}
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 46acbd6f45..a1733348b4 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-16 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #466548
+
+ * exchange-mail-send-options.c: (org_gnome_exchange_send_options):
+ e_msg_composer_get_preferred_account can return NULL, so test for it.
+
2007-08-10 Milan Crha <mcrha@redhat.com>
** Fix for bug #327977
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 3fe9d7f4c1..ea06083642 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -168,6 +168,9 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
char *temp = NULL;
account = e_msg_composer_get_preferred_account (composer);
+ if (!account)
+ return;
+
temp = strstr (account->transport->url, "exchange");
if (!temp) {
return;
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 162cd1d4b3..b8ba9f2396 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-16 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #466548
+
+ * mail-send-options.c: (org_gnome_composer_send_options):
+ e_msg_composer_get_preferred_account can return NULL, so test for it.
+
2007-08-13 Sankar P <psankar@novell.com>
** Fix for bug #330968
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index de4bb8a86d..0f580b99a7 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -146,6 +146,9 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
char *temp = NULL;
account = e_msg_composer_get_preferred_account (comp) ;
+ if (!account)
+ return;
+
temp = strstr (account->transport->url, "groupwise") ;
if (!temp) {
return;