diff options
Diffstat (limited to 'plugins/startup-wizard')
| -rw-r--r-- | plugins/startup-wizard/ChangeLog | 105 | ||||
| -rw-r--r-- | plugins/startup-wizard/startup-wizard.c | 30 |
2 files changed, 25 insertions, 110 deletions
diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog deleted file mode 100644 index 4ac3bcfce9..0000000000 --- a/plugins/startup-wizard/ChangeLog +++ /dev/null @@ -1,105 +0,0 @@ -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #381132 - - * org-gnome-evolution-startup-wizard.eplug.xml: - * startup-wizard.c: (startup_wizard_timezone_page), - (startup_wizard_commit), (startup_wizard_abort): - Do not setup timezone, set a system timezone instead. - -2009-01-21 Milan Crha <mcrha@redhat.com> - - * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. - -2008-09-19 Sankar P <psankar@novell.com> - -License Changes - - * startup-wizard.c: - -2008-08-01 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #529460 - - * org-gnome-evolution-startup-wizard.eplug.xml: - Change "Startup Wizard" to "Setup Assistant". Also make the - plugin description less lame. - -2008-06-02 Jacob Brown <jeblinux@gmail.com> - - ** Fix for bug #529464 - - * org-gnome-evolution-startup-wizard.eplug.xml: Do not use "handle" - -2007-08-20 Matthew Barnes <mbarnes@redhat.com> - - * Makefile.am: Fix a distcheck error. - -2007-03-16 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #360240 - - * startup-wizard.c (startup_wizard_timezone_page): - Remove unused variable. - -2007-01-27 Nickolay V. Shmyrev <nshmyrev@yandex.ru> - - * startup-wizard.c: (startup_wizard_timezone_page), - (startup_wizard_importer_page): - mark strings as translatable. See bug #399381 for details. - -2006-06-14 Srinivasa Ragavan <sragavan@novell.com> - - * startup-wizard.c: (startup_wizard_timezone_page): Pass the default - timezone as NULL, so that it picks up from the local timezone. - -2005-12-30 Andre Klapper <a9016009@gmx.de> - - * evolution/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml: - Fixing several typos and harmonizing - capital/small letters. Partially fixes bug 306117. - -2005-07-13 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am : remove the reference to - shell/importer/libevolution-importer.la - -2005-07-13 Not Zed <NotZed@Ximian.com> - - * startup-wizard.c (startup_wizard_importer_page) - (startup_wizard_commit): re-write the importer stuff to use the - eplugin stuff. - -2005-07-12 Not Zed <NotZed@Ximian.com> - - * startup-wizard.c: removed all the importer stuff. fixed the - copyright. - -2005-07-06 Frederic Crozat <fcrozat@mandriva.com> - - * startup-wizard.c: (startup_wizard_delete), (startup_wizard): - Exit evolution when closing wizard using window manager - control ; don't set hint or wmclass, it is too late, window is already - realized. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use NO_UNDEFINED. Link with more libraries. - -2005-06-18 Tor Lillqvist <tml@novell.com> - - * org-gnome-evolution-startup-wizard.eplug.xml: Use SOEXT. - -2005-05-12 Not Zed <NotZed@Ximian.com> - - * Makefile.am: added built_sources/cleanfiles - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-evolution-startup-wizard.eplug.xml: s/.in/.xml/ & i18n. - -2005-02-21 JP Rosevear <jpr@novell.com> - - * startup-wizard.c: A plugin the does the startup wizard - diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index f6e5dcc34e..904e630487 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -34,6 +34,7 @@ #include "capplet/settings/mail-capplet-shell.h" +gint e_plugin_lib_enable (EPlugin *ep, gint enable); 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); @@ -46,6 +47,12 @@ static EImportImporter *import_importer; static GtkWidget *import_dialog, *import_progress, *import_label; static GSList *import_iterator, *import_importers; +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + G_GNUC_NORETURN static void startup_wizard_terminate (void) { gtk_main_quit (); @@ -237,6 +244,7 @@ startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target) { EShell *shell; EShellSettings *shell_settings; + GtkWidget *content_area; gchar *location; shell = e_shell_get_default (); @@ -254,15 +262,27 @@ startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target) import_iterator = import_importers; import_importer = import_iterator->data; - import_dialog = e_alert_dialog_new_for_args (e_shell_get_active_window (shell), "shell:importing", _("Importing data."), NULL); - g_signal_connect(import_dialog, "response", G_CALLBACK(import_dialog_response), NULL); + import_dialog = e_alert_dialog_new_for_args ( + e_shell_get_active_window (shell), + "shell:importing", _("Importing data."), NULL); + content_area = gtk_dialog_get_content_area ( + GTK_DIALOG (import_dialog)); + g_signal_connect ( + import_dialog, "response", + G_CALLBACK (import_dialog_response), NULL); import_label = gtk_label_new(_("Please wait")); import_progress = gtk_progress_bar_new(); - gtk_box_pack_start(GTK_BOX(((GtkDialog *)import_dialog)->vbox), import_label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(((GtkDialog *)import_dialog)->vbox), import_progress, FALSE, FALSE, 0); + gtk_box_pack_start ( + GTK_BOX (content_area), + import_label, FALSE, FALSE, 0); + gtk_box_pack_start ( + GTK_BOX (content_area), + import_progress, FALSE, FALSE, 0); gtk_widget_show_all(import_dialog); - e_import_import(import, (EImportTarget *)import_target, import_importer, import_status, import_done, NULL); + e_import_import ( + import, (EImportTarget *) import_target, + import_importer, import_status, import_done, NULL); } else { gtk_main_quit(); } |