nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Closes # 6280 Welcome dialog spinner fixed

Browse source 
Squashed commit of the following:

commit ffa4f1d611148ffc2a6a8f00b1d113b19870409c
Author: Eric Gregory <eric@yorba.org>
Date:   Wed Jan 30 18:59:38 2013 -0800

    Fix for spinner on welcome screen
This commit is contained in:
Eric Gregory 2013-01-31 11:32:27 -08:00
parent a2b92a3248
commit a9dc52b658
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/client/accounts/add-edit-page.vala
View file

@ -403,7 +403,7 @@ public class AddEditPage : Gtk.Box {
public Geary.AccountInformation? get_account_information() {
Geary.AccountInformation account_information;
update_ui(); // Force password update.
fix_credentials_for_supported_provider();
Geary.Credentials imap_credentials = new Geary.Credentials(imap_username.strip(), imap_password.strip());
Geary.Credentials smtp_credentials = new Geary.Credentials(smtp_username.strip(), smtp_password.strip());
@ -438,6 +438,16 @@ public class AddEditPage : Gtk.Box {
return account_information;
}
// Assembles credentials for supported providers.
private void fix_credentials_for_supported_provider() {
if (get_service_provider() != Geary.ServiceProvider.OTHER) {
imap_username = email_address;
smtp_username = email_address;
imap_password = password;
smtp_password = password;
}
}
// Updates UI based on various options.
private void update_ui() {
base.show_all();
@ -456,12 +466,6 @@ public class AddEditPage : Gtk.Box {
other_info.hide();
set_other_info_sensitive(mode == PageMode.WELCOME);
// For supported providers, fill out the rest of the form automagically.
imap_username = email_address;
smtp_username = email_address;
imap_password = password;
smtp_password = password;
}
// In edit mode, certain fields are not sensitive.