From 7b7adfaa1c9d744c75340d7794f90f33140eb6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Crozat?= Date: Thu, 7 Jul 2005 17:10:10 +0000 Subject: Exit evolution when closing wizard using window manager control ; don't * 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. svn path=/trunk/; revision=29679 --- plugins/startup-wizard/startup-wizard.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'plugins/startup-wizard/startup-wizard.c') diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 4e7faa1eba..e9dfc217d9 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -223,6 +223,15 @@ init_importers () } } +static void +startup_wizard_delete () { + free_importers (); + + gtk_main_quit (); + _exit (0); +} + + void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) { @@ -253,8 +262,6 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) emae = em_account_editor_new (NULL, EMAE_DRUID, "org.gnome.evolution.mail.config.accountWizard"); gtk_window_set_title (GTK_WINDOW (emae->editor), _("Evolution Setup Assistant")); - gtk_window_set_type_hint (GTK_WINDOW (emae->editor), GDK_WINDOW_TYPE_HINT_NORMAL); - gtk_window_set_wmclass (GTK_WINDOW (emae->editor), "startup-wizard", "Evolution:shell"); start_page = GNOME_DRUID_PAGE_EDGE (e_config_page_get ((EConfig *) emae->config, "0.start")); gnome_druid_page_edge_set_title (start_page, _("Welcome")); @@ -263,6 +270,7 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) "to your email accounts, and to import files from other applications. \n" "\n" "Please click the \"Forward\" button to continue. ")); + g_signal_connect (emae->editor, "delete-event", G_CALLBACK (startup_wizard_delete), NULL); gtk_widget_show (emae->editor); gtk_main (); -- cgit v1.2.3