diff options
| author | Srinivasa Ragavan <sragavan@gnome.org> | 2010-03-01 17:09:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-14 09:49:49 +0800 |
| commit | 13bf56ded0986c5621e8d460d622ed7066b6b997 (patch) | |
| tree | 76949f50a7fad379c1e91e6ad42e379678549a0b | |
| parent | b5354ee4b83fa05b38eda85c79ca590ad3f90bff (diff) | |
| download | gsoc2013-evolution-13bf56ded0986c5621e8d460d622ed7066b6b997.tar.gz gsoc2013-evolution-13bf56ded0986c5621e8d460d622ed7066b6b997.tar.zst gsoc2013-evolution-13bf56ded0986c5621e8d460d622ed7066b6b997.zip | |
Integrate anjal's account capplet lib in start up wizard.
| -rw-r--r-- | plugins/startup-wizard/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/startup-wizard/startup-wizard.c | 24 |
2 files changed, 23 insertions, 2 deletions
diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am index 4c0ced17f5..937f5c1ac7 100644 --- a/plugins/startup-wizard/Makefile.am +++ b/plugins/startup-wizard/Makefile.am @@ -24,6 +24,7 @@ liborg_gnome_evolution_startup_wizard_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/capplet/libevolution-mail-settings.la \ $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index c727c58bcd..a9ef617a7c 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -32,6 +32,8 @@ #include "mail/em-account-editor.h" #include "calendar/gui/calendar-config.h" +#include "capplet/mail-capplet-shell.h" + void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target); GtkWidget *startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data); gboolean startup_wizard_check (EPlugin *ep, EConfigHookPageCheckData *check_data); @@ -50,16 +52,22 @@ startup_wizard_terminate (void) { _exit (0); } +G_GNUC_NORETURN static void +startup_wizard_close (void) { + gtk_main_quit (); +} + void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) { - EMAccountEditor *emae; GtkWidget *start_page; GConfClient *client; GSList *accounts; +#if 0 EConfig *config; GList *page_children; - + EMAccountEditor *emae; +#endif client = gconf_client_get_default (); accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL); g_object_unref (client); @@ -71,6 +79,17 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) return; } + start_page = (GtkWidget *)mail_capplet_shell_new(0); + gtk_widget_show (start_page); + g_signal_connect ( + start_page, "delete-event", + G_CALLBACK (startup_wizard_terminate), NULL); + g_signal_connect ( + start_page, "destroy", + G_CALLBACK (startup_wizard_close), NULL); + + +#if 0 /** @HookPoint-EMConfig: New Mail Account Wizard * @Id: org.gnome.evolution.mail.config.accountWizard * @Type: E_CONFIG_ASSISTANT @@ -110,6 +129,7 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) gtk_widget_show (emae->editor); +#endif gtk_main (); } |