aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorParthasarathi Susarla <sparthasarathi@novell.com>2005-10-22 16:18:50 +0800
committerParthasarathi Susarla <saps@src.gnome.org>2005-10-22 16:18:50 +0800
commit05601e86ebfc36093c8b2afb66cbe14cb45d6bd2 (patch)
tree75999f72fb1056b2501c12bab13b46556f0bdf30
parenta0ce7e9771be25292bf985a96db5603b34a68d9e (diff)
downloadgsoc2013-evolution-05601e86ebfc36093c8b2afb66cbe14cb45d6bd2.tar
gsoc2013-evolution-05601e86ebfc36093c8b2afb66cbe14cb45d6bd2.tar.gz
gsoc2013-evolution-05601e86ebfc36093c8b2afb66cbe14cb45d6bd2.tar.bz2
gsoc2013-evolution-05601e86ebfc36093c8b2afb66cbe14cb45d6bd2.tar.lz
gsoc2013-evolution-05601e86ebfc36093c8b2afb66cbe14cb45d6bd2.tar.xz
gsoc2013-evolution-05601e86ebfc36093c8b2afb66cbe14cb45d6bd2.tar.zst
gsoc2013-evolution-05601e86ebfc36093c8b2afb66cbe14cb45d6bd2.zip
Return valid transport, only if the account is enabled.
2005-10-22 Parthasarathi Susarla <sparthasarathi@novell.com> * mail-config.c: (mail_config_get_default_account): Return valid transport, only if the account is enabled. 2005-10-22 Parthasarathi Susarla <sparthasarathi@novell.com> * em-composer-utils.c: (create_new_composer): If the account corresponding to the fromuri is not enabled. Then load the preferred account from the composer. ---------------------------------------------------------------------- svn path=/trunk/; revision=30555
-rw-r--r--mail/ChangeLog18
-rw-r--r--mail/em-composer-utils.c7
-rw-r--r--mail/em-folder-tree.c2
-rw-r--r--mail/em-format-html-display.h2
-rw-r--r--mail/mail-config.c4
-rw-r--r--mail/mail-ops.c2
6 files changed, 26 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b1418f79aa..3da985747d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2005-10-22 Parthasarathi Susarla <sparthasarathi@novell.com>
+
+ * mail-config.c: (mail_config_get_default_account):
+ Return valid transport, only if the account is enabled.
+
+2005-10-22 Parthasarathi Susarla <sparthasarathi@novell.com>
+
+ * em-composer-utils.c: (create_new_composer):
+ If the account corresponding to the fromuri is not enabled.
+ Then load the preferred account from the composer.
+
2005-10-21 Jeff Cai <jeff.cai@sun.com>
Reverse previous patch because of bug 319376.
@@ -10,11 +21,10 @@
because it will be -1 on linux if being declared one bit of int.
2005-10-19 Philip Van Hoof <pvanhoof@gnome.org>
- composer/e-msg-composer-select-file.c,
- composer/e-msg-composer.c, composer/e-msg-composer.h,
- composer/evolution-composer.c, composer/listener.c,
+
+ ** See bug 318611
+
mail/em-composer-utils.c,
- plugins/mailing-list-actions/mailing-list-actions.c:
data hiding
2005-10-19 Harish Krishnaswamy <kharish@novell.com>
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index c4f472cf8f..66f4ca90a0 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -588,6 +588,13 @@ create_new_composer (const char *subject, const char *fromuri)
if (fromuri)
account = mail_config_get_account_by_source_url(fromuri);
+ /* If the account corresponding to the fromuri is not enabled.
+ * We get the preffered account from the composer and use that
+ * as the account to send the mail.
+ */
+ if (!account)
+ account = e_msg_composer_get_preferred_account (composer);
+
e_msg_composer_set_headers (composer, account?account->name:NULL, NULL, NULL, NULL, subject);
em_composer_utils_setup_default_callbacks (composer);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 0fdd1a65bf..c709165c02 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1725,7 +1725,7 @@ emft_get_folder_info__got (struct _mail_msg *mm)
gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path);
/* if we had an error, then we need to re-set the load subdirs state and collapse the node */
- if (camel_exception_is_set(&mm->ex)) {
+ if (!m->fi && camel_exception_is_set(&mm->ex)) {
gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1);
gtk_tree_view_collapse_row (priv->treeview, path);
gtk_tree_path_free (path);
diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h
index 7493bc227d..c1aa050c70 100644
--- a/mail/em-format-html-display.h
+++ b/mail/em-format-html-display.h
@@ -59,7 +59,7 @@ void em_format_html_display_paste (EMFormatHTMLDisplay *efhd);
void em_format_html_display_zoom_in (EMFormatHTMLDisplay *efhd);
void em_format_html_display_zoom_out (EMFormatHTMLDisplay *efhd);
void em_format_html_display_zoom_reset (EMFormatHTMLDisplay *efhd);
-EAttachmentBar * em_format_html_display_get_bar (EMFormatHTMLDisplay *efhd);
+EAttachmentBar *em_format_html_display_get_bar (EMFormatHTMLDisplay *efhd);
gboolean em_format_html_display_popup_menu (EMFormatHTMLDisplay *efhd);
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 7d3a876a47..6619b49b84 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -741,7 +741,7 @@ mail_config_get_default_transport (void)
EIterator *iter;
account = mail_config_get_default_account ();
- if (account && account->transport && account->transport->url && account->transport->url[0])
+ if (account && account->enabled && account->transport && account->transport->url && account->transport->url[0])
return account->transport;
/* return the first account with a transport? */
@@ -749,7 +749,7 @@ mail_config_get_default_transport (void)
while (e_iterator_is_valid (iter)) {
account = (EAccount *) e_iterator_get (iter);
- if (account->transport && account->transport->url && account->transport->url[0]) {
+ if (account->enabled && account->transport && account->transport->url && account->transport->url[0]) {
g_object_unref (iter);
return account->transport;
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 030fe8afc2..5ed2e74f92 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1073,7 +1073,7 @@ get_folderinfo_got (struct _mail_msg *mm)
{
struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
- if (camel_exception_is_set (&mm->ex)) {
+ if (!m->info && camel_exception_is_set (&mm->ex)) {
char *url;
url = camel_service_get_url (CAMEL_SERVICE (m->store));