[evolution-patches] Re: Please review my patch for bug #46284

[Antonio Xu <antonio xu sun com>]

Hello Ettore
Thanks for you review my patch , I have crearted a new patch according your
advice. In my new patch. I use delete_event instead of destroy.

Regards
Anto
Ettore Perazzoli wrote:
> On Mon, 2003-07-14 at 01:33, Antonio Xu wrote:
> >        Could you review my patch for bug #46284? My patch can solve this
> > problem. This bug is due to when user close evolution icon in pane, it 
> > will close the evolution's setup windows, but there haven't "destroy" 
> > signal handler in setup windows, so evolution doesn't exit after the setup
> > windows is closed.I add a "destroy" signal handler in setup window, which
> > can solve th problem.
> >   
>
> Hmm "destroy" can be invoked multiple times in GTK 2, so I think you
> want to connect to "delete_event" instead.
>
> -- Ettore




Index: ./shell/e-shell-startup-wizard.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-startup-wizard.c,v
retrieving revision 1.41
diff -u -r1.41 e-shell-startup-wizard.c
--- ./shell/e-shell-startup-wizard.c	11 Mar 2003 22:25:47 -0000	1.41
+++ ./shell/e-shell-startup-wizard.c	16 Jul 2003 09:52:31 -0000
@@ -734,6 +734,14 @@
 	gtk_main_quit ();
 }
 
+static void
+startup_wizard_delete (GnomeDruid *druid,
+		       GdkEventAny *ev,
+	       	       SWData *data)
+{
+	startup_wizard_cancel(druid, data);
+}
+
 gboolean
 e_shell_startup_wizard_create (void)
 {
@@ -761,6 +769,9 @@
 	g_return_val_if_fail (data->dialog != NULL, FALSE);
 	gtk_window_set_wmclass (GTK_WINDOW (data->dialog), "startup-wizard",
 				"Evolution:shell");
+
+	g_signal_connect_after (data->dialog, "delete_event",
+			  G_CALLBACK (startup_wizard_delete), data);
 
 	page_hash = g_hash_table_new (NULL, NULL);
 	data->druid = glade_xml_get_widget (data->wizard, "startup-druid");
Index: ./shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1287
diff -u -r1.1287 ChangeLog
--- ./shell/ChangeLog	9 Jul 2003 19:54:25 -0000	1.1287
+++ ./shell/ChangeLog	16 Jul 2003 09:57:01 -0000
@@ -1,3 +1,8 @@
+2003-07-14  Antonio Xu  <antonio xu sun com>
+
+       * e-shell-startup-wizard.c (e_shell_startup_wizard_create): connect
+       to "delete_event" signal with startup_wizard_delete. [#46284]
+
 2003-07-09  Ettore Perazzoli  <ettore ximian com>
 
 	* e-shell-folder-commands.c (e_shell_command_rename_folder): Do