aboutsummaryrefslogtreecommitdiffstats
path: root/modules/startup-wizard
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-08-11 03:58:39 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-08-11 04:13:08 +0800
commit15376b6657c77d4f701367c4f14bed653201fe26 (patch)
treeacb7081ff7f41653e8684738bf1677ec896721fb /modules/startup-wizard
parent90e4a46478e5c39b51bfd36bc252c10e9cd60865 (diff)
downloadgsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar
gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar.gz
gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar.bz2
gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar.lz
gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar.xz
gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar.zst
gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.zip
EConfig: Broadcast abort/commit events by way of signals.
Remove the clumsy abortfunc and commitfunc callback arguments from e_config_add_items().
Diffstat (limited to 'modules/startup-wizard')
-rw-r--r--modules/startup-wizard/evolution-startup-wizard.c12
1 files changed, 8 insertions, 4 deletions
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. */