Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1488
diff -u -p -r1.1488 ChangeLog
--- ChangeLog	10 Jan 2005 02:35:12 -0000	1.1488
+++ ChangeLog	20 Jan 2005 09:55:34 -0000
@@ -1,3 +1,9 @@
+2005-01-20  Mengjie Yu  <meng-jie.yu@sun.com>
+
+	* e-shell-importer.c: (import_druid_esc),
+	(e_shell_importer_start_import):
+	Close import wizard on 'ESC'
+
 2005-01-09  JP Rosevear  <jpr@novell.com>
 
 	* e-shell.c (impl_Shell_handleURI): open a new window if we get a
Index: e-shell-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-importer.c,v
retrieving revision 1.78
diff -u -p -r1.78 e-shell-importer.c
--- e-shell-importer.c	30 Sep 2004 08:42:11 -0000	1.78
+++ e-shell-importer.c	20 Jan 2005 09:55:37 -0000
@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include <glib.h>
+#include <gdk/gdkkeysyms.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-edge.h>
@@ -933,6 +934,19 @@ import_druid_cancel (GnomeDruid *druid,
   	gtk_widget_destroy (GTK_WIDGET (data->dialog));
 }
 
+static gboolean
+import_druid_esc (GnomeDruid *druid, 
+		  GdkEventKey *event, 
+		  ImportData *data)
+{
+        if (event->keyval == GDK_Escape) {
+		gtk_widget_destroy (GTK_WIDGET (data->dialog));
+		return TRUE;
+        }
+        else
+                return FALSE;
+}
+
 static void
 import_druid_weak_notify (void *blah,
 			  GObject *where_the_object_was)
@@ -1215,6 +1229,8 @@ e_shell_importer_start_import (EShellWin
 	data->druid = glade_xml_get_widget (data->wizard, "druid1");
 	g_signal_connect (data->druid, "cancel",
 			  G_CALLBACK (import_druid_cancel), data);
+	g_signal_connect (data->druid, "key_press_event",
+			  G_CALLBACK (import_druid_esc), data);
 
 	gtk_button_set_use_underline ((GtkButton *)((GnomeDruid *)data->druid)->finish, TRUE);
 	gtk_button_set_label((GtkButton *)((GnomeDruid *)data->druid)->finish, _("_Import"));
