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 /capplet/settings | |
| 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 'capplet/settings')
| -rw-r--r-- | capplet/settings/mail-account-view.c | 1 | ||||
| -rw-r--r-- | capplet/settings/mail-capplet-shell.c | 4 | ||||
| -rw-r--r-- | capplet/settings/mail-capplet-shell.h | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 54401412e2..4410fa475d 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -1004,6 +1004,7 @@ mail_account_view_construct (MailAccountView *view) view->current_page = 0; gtk_box_pack_start ((GtkBox *)view, view->scroll, TRUE, TRUE, 0); view->edit = em_account_editor_new_for_pages (view->original, EMAE_PAGES, "org.gnome.evolution.mail.config.accountWizard", view->wpages); + gtk_widget_hide (e_config_create_widget (E_CONFIG (view->edit->config))); view->edit->emae_check_servers = emae_check_servers; if (!view->original) { e_account_set_bool (em_account_editor_get_modified_account(view->edit), E_ACCOUNT_SOURCE_SAVE_PASSWD, TRUE); diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 33b22f80be..d27e4d85fc 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -274,13 +274,13 @@ mail_capplet_shell_toolbar_height (MailCappletShell *shell) return allocation.height; } -MailCappletShell * +GtkWidget * mail_capplet_shell_new (gint socket_id, gboolean just_druid, gboolean main_loop) { MailCappletShell *shell = g_object_new (MAIL_CAPPLET_SHELL_TYPE, NULL); mail_capplet_shell_construct (shell, socket_id, just_druid, main_loop); - return shell; + return GTK_WIDGET (shell); } #define PERSONAL_RELATIVE_URI "system" diff --git a/capplet/settings/mail-capplet-shell.h b/capplet/settings/mail-capplet-shell.h index 5845973065..05159a5595 100644 --- a/capplet/settings/mail-capplet-shell.h +++ b/capplet/settings/mail-capplet-shell.h @@ -51,8 +51,7 @@ typedef struct _MailCappletShellClass { } MailCappletShellClass; GType mail_capplet_shell_get_type (void); -MailCappletShell * - mail_capplet_shell_new (gint socket_id, +GtkWidget * mail_capplet_shell_new (gint socket_id, gboolean just_druid, gboolean main_loop); gint mail_capplet_shell_toolbar_height |