aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Crozat <fcrozat@src.gnome.org>2005-07-08 01:10:10 +0800
committerFrédéric Crozat <fcrozat@src.gnome.org>2005-07-08 01:10:10 +0800
commit7b7adfaa1c9d744c75340d7794f90f33140eb6fe (patch)
treedc7d8a9173b11d577211547a6944d2e566e9fbfd
parent3a92a0bb17fcdf69673df947e36d18ee7da89448 (diff)
downloadgsoc2013-evolution-7b7adfaa1c9d744c75340d7794f90f33140eb6fe.tar.gz
gsoc2013-evolution-7b7adfaa1c9d744c75340d7794f90f33140eb6fe.tar.zst
gsoc2013-evolution-7b7adfaa1c9d744c75340d7794f90f33140eb6fe.zip
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
-rw-r--r--plugins/startup-wizard/ChangeLog7
-rw-r--r--plugins/startup-wizard/startup-wizard.c12
2 files changed, 17 insertions, 2 deletions
diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog
index d8bbcf3654..911ce1cce4 100644
--- a/plugins/startup-wizard/ChangeLog
+++ b/plugins/startup-wizard/ChangeLog
@@ -1,3 +1,10 @@
+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.
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 ();