[geary/wip/714104-refine-account-dialog] Remove old accounts and login dialogs
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/714104-refine-account-dialog] Remove old accounts and login dialogs
- Date: Sun, 9 Dec 2018 08:27:52 +0000 (UTC)
commit e4253233b0d48f1ac116d73ef7384a0a6b60ad50
Author: Michael Gratton <mike vee net>
Date: Sat Dec 8 16:10:16 2018 +1100
Remove old accounts and login dialogs
They served us well beyond their time.
po/POTFILES.in | 11 -
.../accounts/account-dialog-account-list-pane.vala | 241 ------
.../accounts/account-dialog-add-edit-pane.vala | 89 --
.../account-dialog-edit-alternate-emails-pane.vala | 201 -----
src/client/accounts/account-dialog-pane.vala | 23 -
.../account-dialog-remove-confirm-pane.vala | 37 -
.../accounts/account-dialog-remove-fail-pane.vala | 19 -
.../accounts/account-dialog-spinner-pane.vala | 15 -
src/client/accounts/account-dialog.vala | 207 -----
src/client/accounts/account-spinner-page.vala | 15 -
src/client/accounts/add-edit-page.vala | 944 ---------------------
src/client/accounts/login-dialog.vala | 88 --
src/client/application/geary-application.vala | 18 +-
src/client/application/geary-controller.vala | 15 +-
src/client/meson.build | 11 -
15 files changed, 7 insertions(+), 1927 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d3f2263c..a0a6d1fc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,15 +6,6 @@ desktop/org.gnome.Geary.appdata.xml.in
desktop/org.gnome.Geary.desktop.in
desktop/org.gnome.Geary.gschema.xml
src/geary-version.vala.in
-src/client/accounts/account-dialog-account-list-pane.vala
-src/client/accounts/account-dialog-add-edit-pane.vala
-src/client/accounts/account-dialog-edit-alternate-emails-pane.vala
-src/client/accounts/account-dialog-pane.vala
-src/client/accounts/account-dialog-remove-confirm-pane.vala
-src/client/accounts/account-dialog-remove-fail-pane.vala
-src/client/accounts/account-dialog-spinner-pane.vala
-src/client/accounts/account-dialog.vala
-src/client/accounts/account-spinner-page.vala
src/client/accounts/accounts-editor.vala
src/client/accounts/accounts-editor-add-pane.vala
src/client/accounts/accounts-editor-edit-pane.vala
@@ -23,8 +14,6 @@ src/client/accounts/accounts-editor-remove-pane.vala
src/client/accounts/accounts-editor-row.vala
src/client/accounts/accounts-editor-servers-pane.vala
src/client/accounts/accounts-manager.vala
-src/client/accounts/add-edit-page.vala
-src/client/accounts/login-dialog.vala
src/client/application/application-avatar-store.vala
src/client/application/autostart-manager.vala
src/client/application/application-command.vala
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index 6543486a..e7ecc762 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -205,21 +205,9 @@ public class GearyApplication : Gtk.Application {
if (!present())
create_async.begin();
}
-
+
public bool present() {
- if (controller == null)
- return false;
-
- // if LoginDialog (i.e. the opening dialog for creating the initial account) is present
- // and visible, bring that to top (to prevent opening the hidden main window, which is
- // empty)
- if (controller.login_dialog != null && controller.login_dialog.visible) {
- controller.login_dialog.present_with_time(Gdk.CURRENT_TIME);
-
- return true;
- }
-
- if (controller.main_window == null)
+ if (controller == null || controller.main_window == null)
return false;
// Use present_with_time and a synthesised time so the present
@@ -234,7 +222,7 @@ public class GearyApplication : Gtk.Application {
return true;
}
-
+
private async void create_async() {
// Manually keep the main loop around for the duration of this call.
// Without this, the main loop will exit as soon as we hit the yield
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 2bc85320..7cb7c218 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -98,10 +98,8 @@ public class GearyController : Geary.BaseObject {
public MainWindow? main_window { get; private set; default = null; }
public Geary.App.ConversationMonitor? current_conversations { get; private set; default = null; }
-
+
public AutostartManager? autostart_manager { get; private set; default = null; }
-
- public LoginDialog? login_dialog { get; private set; default = null; }
public Application.AvatarStore? avatar_store {
get; private set; default = null;
@@ -493,11 +491,6 @@ public class GearyController : Geary.BaseObject {
this.upgrade_dialog = null;
- if (login_dialog != null) {
- this.login_dialog.destroy();
- this.login_dialog = null;
- }
-
this.current_account = null;
this.current_folder = null;
@@ -768,9 +761,9 @@ public class GearyController : Geary.BaseObject {
// use LoginDialog for parent only if available and visible
Gtk.Window? parent;
- if (login_dialog != null && login_dialog.visible)
- parent = login_dialog;
- else
+ //if (login_dialog != null && login_dialog.visible)
+ // parent = login_dialog;
+ //else
parent = main_window;
Geary.Endpoint endpoint = get_endpoint(account, service);
diff --git a/src/client/meson.build b/src/client/meson.build
index 1e23be0c..6cb48042 100644
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -10,15 +10,6 @@ geary_client_vala_sources = files(
'application/goa-mediator.vala',
'application/secret-mediator.vala',
- 'accounts/account-dialog.vala',
- 'accounts/account-dialog-account-list-pane.vala',
- 'accounts/account-dialog-add-edit-pane.vala',
- 'accounts/account-dialog-edit-alternate-emails-pane.vala',
- 'accounts/account-dialog-pane.vala',
- 'accounts/account-dialog-remove-confirm-pane.vala',
- 'accounts/account-dialog-remove-fail-pane.vala',
- 'accounts/account-dialog-spinner-pane.vala',
- 'accounts/account-spinner-page.vala',
'accounts/accounts-editor.vala',
'accounts/accounts-editor-add-pane.vala',
'accounts/accounts-editor-edit-pane.vala',
@@ -27,8 +18,6 @@ geary_client_vala_sources = files(
'accounts/accounts-editor-row.vala',
'accounts/accounts-editor-servers-pane.vala',
'accounts/accounts-manager.vala',
- 'accounts/add-edit-page.vala',
- 'accounts/login-dialog.vala',
'components/client-web-view.vala',
'components/components-validator.vala',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]