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

Don't display main window until Welcome dialog is dismissed: Closes #6566

Browse source
This commit is contained in:
Avi Levy 2013-06-07 17:49:53 -07:00 • committed by Jim Nelson
parent 18b76a5084
commit b882b6e62d
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/client/geary-controller.vala
View file

@ -136,16 +136,6 @@ public class GearyController {
Geary.Engine.instance.account_available.connect(on_account_available);
Geary.Engine.instance.account_unavailable.connect(on_account_unavailable);
// Start Geary.
try {
yield Geary.Engine.instance.open_async(GearyApplication.instance.get_user_data_directory(),
GearyApplication.instance.get_resource_directory(), new SecretMediator());
if (Geary.Engine.instance.get_accounts().size == 0)
create_account();
} catch (Error e) {
error("Error opening Geary.Engine instance: %s", e.message);
}
// Connect to various UI signals.
main_window.conversation_list_view.conversations_selected.connect(on_conversations_selected);
main_window.conversation_list_view.load_more.connect(on_load_more);
@ -186,7 +176,18 @@ public class GearyController {
set_busy(false);
main_window.show_all();
// Start Geary.
try {
yield Geary.Engine.instance.open_async(GearyApplication.instance.get_user_data_directory(),
GearyApplication.instance.get_resource_directory(), new SecretMediator());
if (Geary.Engine.instance.get_accounts().size == 0) {
create_account();
} else {
main_window.show_all();
}
} catch (Error e) {
error("Error opening Geary.Engine instance: %s", e.message);
}
}
/**
@ -392,6 +393,9 @@ public class GearyController {
result = yield validate_or_retry_async(result, cancellable);
} while (result != null);
if (main_window != null) {
main_window.show_all();
}
if (login_dialog != null)
login_dialog.hide();
}