diff options
author | Not Zed <NotZed@Ximian.com> | 2003-09-18 05:19:04 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2003-09-18 05:19:04 +0800 |
commit | 81a0ff5bc44a3bd11399e6b3c985735737606c8c (patch) | |
tree | 54b5ed4342a6843c1db4c7e75f2e1b1fe9b82dff /mail/mail-account-gui.c | |
parent | a36a1bb70b6ebcb51ac39304370c89bda63e11b9 (diff) | |
download | gsoc2013-evolution-81a0ff5bc44a3bd11399e6b3c985735737606c8c.tar gsoc2013-evolution-81a0ff5bc44a3bd11399e6b3c985735737606c8c.tar.gz gsoc2013-evolution-81a0ff5bc44a3bd11399e6b3c985735737606c8c.tar.bz2 gsoc2013-evolution-81a0ff5bc44a3bd11399e6b3c985735737606c8c.tar.lz gsoc2013-evolution-81a0ff5bc44a3bd11399e6b3c985735737606c8c.tar.xz gsoc2013-evolution-81a0ff5bc44a3bd11399e6b3c985735737606c8c.tar.zst gsoc2013-evolution-81a0ff5bc44a3bd11399e6b3c985735737606c8c.zip |
cvs removed.
2003-09-17 Not Zed <NotZed@Ximian.com>
* folder-browser.c, folder-browser.h, folder-browser-ui.c
folder-browser-ui.h, mail-callbacks.c, mail-callbacks.h
mail-display.c, mail-display.h, mail-display-stream.c
mail-display-stream.h, mail-format.c, mail-format.h
mail-identify.c, mail-search.c, mail-search.h
message-browser.c, message-browser.h, subscribe-dialog.c
subscribe-dialog.h, mail-font-prefs.c, mail-font-prefs.h: cvs
removed.
* Makefile.am: Removed mail-font-prefs.[ch], hasn't been built for
ages.
* em-*.c: killed a bunch of printfs.
* em-format-html-display.c (efhd_html_button_press_event): update
for html object api chagnes.
** Merge in mail-refactor-2 branch.
svn path=/trunk/; revision=22602
Diffstat (limited to 'mail/mail-account-gui.c')
-rw-r--r-- | mail/mail-account-gui.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index 2bba8944e6..6d965ece6b 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -1862,7 +1862,6 @@ mail_account_gui_save (MailAccountGui *gui) { EAccount *account, *new; CamelProvider *provider = NULL; - CamelURL *source_url = NULL, *url; gboolean is_new = FALSE; const char *new_name; gboolean is_storage; @@ -1907,10 +1906,8 @@ mail_account_gui_save (MailAccountGui *gui) /* source */ save_service (&gui->source, gui->extra_config, new->source); - if (new->source->url) { + if (new->source->url) provider = camel_session_get_provider (session, new->source->url, NULL); - source_url = provider ? camel_url_new (new->source->url, NULL) : NULL; - } new->source->auto_check = gtk_toggle_button_get_active (gui->source_auto_check); if (new->source->auto_check) @@ -1924,34 +1921,21 @@ mail_account_gui_save (MailAccountGui *gui) save_service (&gui->transport, NULL, new->transport); /* Check to make sure that the Drafts folder uri is "valid" before assigning it */ - url = source_url && gui->drafts_folder_uri ? camel_url_new (gui->drafts_folder_uri, NULL) : NULL; - if (mail_config_get_account_by_source_url (gui->drafts_folder_uri) || - (url && provider->url_equal (source_url, url))) { + if (mail_config_get_account_by_source_url (gui->drafts_folder_uri)) { new->drafts_folder_uri = g_strdup (gui->drafts_folder_uri); } else { /* assign defaults - the uri is unknown to us (probably pointed to an old source url) */ new->drafts_folder_uri = g_strdup (default_drafts_folder_uri); } - if (url) - camel_url_free (url); - /* Check to make sure that the Sent folder uri is "valid" before assigning it */ - url = source_url && gui->sent_folder_uri ? camel_url_new (gui->sent_folder_uri, NULL) : NULL; - if (mail_config_get_account_by_source_url (gui->sent_folder_uri) || - (url && provider->url_equal (source_url, url))) { + if (mail_config_get_account_by_source_url (gui->sent_folder_uri)) { new->sent_folder_uri = g_strdup (gui->sent_folder_uri); } else { /* assign defaults - the uri is unknown to us (probably pointed to an old source url) */ new->sent_folder_uri = g_strdup (default_sent_folder_uri); } - if (url) - camel_url_free (url); - - if (source_url) - camel_url_free (source_url); - new->always_cc = gtk_toggle_button_get_active (gui->always_cc); new->cc_addrs = g_strdup (gtk_entry_get_text (gui->cc_addrs)); new->always_bcc = gtk_toggle_button_get_active (gui->always_bcc); |