2005-05-23 [colin] 1.0.4cvs12

[claws.git] / src / gtk / colorsel.c

diff --git a/src/gtk/colorsel.c b/src/gtk/colorsel.c
index ba6aa60229b843a15343e4757a04ed6c99062816..da0fd8d54fca4e93569f53ca2e8866963b9e93f9 100644 (file)
--- a/src/gtk/colorsel.c
+++ b/src/gtk/colorsel.c
@@ -34,12 +34,20 @@ static void quote_colors_set_dialog_cancel(GtkWidget *widget, gpointer data)
        gtk_main_quit();
 }
 
-static void quote_colors_set_dialog_key_pressed(GtkWidget *widget,
+static gint quote_colors_set_dialog_key_pressed(GtkWidget *widget,
                                                GdkEventKey *event,
                                                gpointer data)
 {
-       *((gint *) data) = 1;
-       gtk_main_quit();
+       if (event && event->keyval == GDK_Escape) {
+               *((gint *) data) = 1;
+               gtk_main_quit();
+               return TRUE;
+       } else if (event && event->keyval == GDK_Return) {
+               *((gint *) data) = 0;
+               gtk_main_quit();
+               return FALSE;
+       }
+       return FALSE;
 }
 
 gint colorsel_select_color_rgb(gchar *title, gint rgbvalue)