[evolution-patches] Patch: allow startup wizard to quit evolution, remove some warnings

[Frederic Crozat <fcrozat mandriva com>]

The attached patches (2.10 and HEAD version) fix the following issues in
the startup wizard plugin :
-when closing wizard using window manager control, evolution was not
exiting
-wizard code was trying to set window hint and wmclass, but too late in
the game (window was already realized and display by e-config). Since
those calls were always causing failing and causing assertions, I
removed them.


-- 
Frederic Crozat <fcrozat mandriva com>
Mandriva

Index: plugins/startup-wizard/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/startup-wizard/ChangeLog,v
retrieving revision 1.1
diff -u -p -r1.1 ChangeLog
--- plugins/startup-wizard/ChangeLog	1 Mar 2005 06:08:57 -0000	1.1
+++ plugins/startup-wizard/ChangeLog	6 Jul 2005 17:18:46 -0000
@@ -1,3 +1,9 @@
+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-02-21  JP Rosevear  <jpr novell com>
 
 	* startup-wizard.c: A plugin the does the startup wizard
Index: plugins/startup-wizard/startup-wizard.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/startup-wizard/startup-wizard.c,v
retrieving revision 1.1
diff -u -p -r1.1 startup-wizard.c
--- plugins/startup-wizard/startup-wizard.c	1 Mar 2005 06:08:57 -0000	1.1
+++ plugins/startup-wizard/startup-wizard.c	6 Jul 2005 17:18:46 -0000
@@ -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, ESEventTarg
 	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, ESEventTarg
 					"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 ();

Index: plugins/startup-wizard/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/startup-wizard/ChangeLog,v
retrieving revision 1.5
diff -u -p -r1.5 ChangeLog
--- plugins/startup-wizard/ChangeLog	27 Jun 2005 00:55:24 -0000	1.5
+++ plugins/startup-wizard/ChangeLog	6 Jul 2005 17:21:46 -0000
@@ -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.
Index: plugins/startup-wizard/startup-wizard.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/startup-wizard/startup-wizard.c,v
retrieving revision 1.1
diff -u -p -r1.1 startup-wizard.c
--- plugins/startup-wizard/startup-wizard.c	1 Mar 2005 06:08:57 -0000	1.1
+++ plugins/startup-wizard/startup-wizard.c	6 Jul 2005 17:21:46 -0000
@@ -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, ESEventTarg
 	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, ESEventTarg
 					"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 ();