From 15376b6657c77d4f701367c4f14bed653201fe26 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 10 Aug 2011 15:58:39 -0400 Subject: EConfig: Broadcast abort/commit events by way of signals. Remove the clumsy abortfunc and commitfunc callback arguments from e_config_add_items(). --- modules/startup-wizard/evolution-startup-wizard.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'modules/startup-wizard') diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index 5e3b028cdf..3cfca9318a 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -167,7 +167,6 @@ completed: static void startup_wizard_config_abort (EConfig *config, - GSList *items, EStartupWizard *extension) { GtkAssistant *assistant; @@ -209,7 +208,6 @@ startup_wizard_config_abort (EConfig *config, static void startup_wizard_config_commit (EConfig *config, - GSList *items, EStartupWizard *extension) { EShell *shell; @@ -480,8 +478,6 @@ startup_wizard_new_assistant (EStartupWizard *extension) e_config_add_items ( config, items, - (EConfigItemsFunc) startup_wizard_config_commit, - (EConfigItemsFunc) startup_wizard_config_abort, (EConfigItemsFunc) startup_wizard_config_free, g_object_ref (extension)); @@ -489,6 +485,14 @@ startup_wizard_new_assistant (EStartupWizard *extension) config, "70.progress", (EConfigCheckFunc) startup_wizard_check_progress, extension); + g_signal_connect ( + config, "abort", + G_CALLBACK (startup_wizard_config_abort), extension); + + g_signal_connect ( + config, "commit", + G_CALLBACK (startup_wizard_config_commit), extension); + e_config_create_window (config, NULL, _("Evolution Setup Assistant")); /* Additional tweaks. The window must be created at this point. */ -- cgit v1.2.3