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



Hello Ettore

Thanks for you review my patch, I forgot add retrun value for callback fucntion, I have recreate a new patch for bug #46284. Could review it again?

Best regards
Anto
Ettore Perazzoli wrote:

On Wed, 2003-07-16 at 06:56, Antonio Xu wrote:
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.

delete_event is supposed to return a boolean value (see the docs for
GtkWidget).  You need to return FALSE if you want the window to be
destroyed after returning from your callback, or TRUE if you want it to
stay.

-- Ettore


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
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	17 Jul 2003 03:38:28 -0000
@@ -734,6 +734,15 @@
 	gtk_main_quit ();
 }
 
+static gboolean
+startup_wizard_delete (GnomeDruid *druid,
+		       GdkEventAny *ev,
+	       	       SWData *data)
+{
+	startup_wizard_cancel(druid, data);
+	return FALSE;
+}
+
 gboolean
 e_shell_startup_wizard_create (void)
 {
@@ -761,6 +770,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");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]