diff options
Diffstat (limited to 'plugins/startup-wizard/startup-wizard.c')
| -rw-r--r-- | plugins/startup-wizard/startup-wizard.c | 30 |
1 files changed, 25 insertions, 5 deletions
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(); } |