diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-02 08:20:35 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-03 04:36:11 +0800 |
commit | 7959b11113a399f649c28b86fb57daf8c6c542b9 (patch) | |
tree | c0485f8ba9e9555cb4a22e22edf3625a79bfbd75 /modules/mail | |
parent | f5f7d23c543fc3d110c9713e9335c1cd41a16aff (diff) | |
download | gsoc2013-evolution-7959b11113a399f649c28b86fb57daf8c6c542b9.tar gsoc2013-evolution-7959b11113a399f649c28b86fb57daf8c6c542b9.tar.gz gsoc2013-evolution-7959b11113a399f649c28b86fb57daf8c6c542b9.tar.bz2 gsoc2013-evolution-7959b11113a399f649c28b86fb57daf8c6c542b9.tar.lz gsoc2013-evolution-7959b11113a399f649c28b86fb57daf8c6c542b9.tar.xz gsoc2013-evolution-7959b11113a399f649c28b86fb57daf8c6c542b9.tar.zst gsoc2013-evolution-7959b11113a399f649c28b86fb57daf8c6c542b9.zip |
Convert "startup-wizard" to an EExtension.
Convert the "startup-wizard" EPlugin to an EExtension, and fix up the
importing UI a bit (but it still needs a lot more love). Importing
progress is now shown directly in the GtkAssistant window.
Define a new EConfigItem type (E_CONFIG_PAGE_PROGRESS) for creating
progress pages in a GtkAssistant.
Also, change EMAccountEditor semantics slightly: you now have to call
e_config_create_window() manually after creating a new EMAccountEditor
instance. This allows extra EConfigItems (specifications for the window
content) to be added manually before the window is created.
Diffstat (limited to 'modules/mail')
-rw-r--r-- | modules/mail/em-account-prefs.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c index 0ac397fc72..90aaa968f7 100644 --- a/modules/mail/em-account-prefs.c +++ b/modules/mail/em-account-prefs.c @@ -124,7 +124,13 @@ account_prefs_add_account (EAccountManager *manager) emae = em_account_editor_new ( NULL, EMAE_ASSISTANT, "org.gnome.evolution.mail.config.accountAssistant"); - priv->assistant = emae->editor; + e_config_create_window ( + E_CONFIG (emae->config), NULL, + _("Evolution Account Assistant")); + priv->assistant = E_CONFIG (emae->config)->window; + g_object_set_data_full ( + G_OBJECT (priv->assistant), "AccountEditor", + emae, (GDestroyNotify) g_object_unref); } else { priv->assistant = mail_capplet_shell_new (0, TRUE, FALSE); } @@ -168,10 +174,14 @@ account_prefs_edit_account (EAccountManager *manager) emae = em_account_editor_new ( account, EMAE_NOTEBOOK, "org.gnome.evolution.mail.config.accountEditor"); - priv->editor = emae->editor; + e_config_create_window ( + E_CONFIG (emae->config), parent, _("Account Editor")); + priv->editor = E_CONFIG (emae->config)->window; + g_object_set_data_full ( + G_OBJECT (priv->editor), "AccountEditor", + emae, (GDestroyNotify) g_object_unref); g_object_add_weak_pointer (G_OBJECT (priv->editor), &priv->editor); - gtk_window_set_transient_for (GTK_WINDOW (priv->editor), parent); gtk_widget_show (priv->editor); } |