From 0e299fea8e52df6e279abbcb43d81e332a09b9c4 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 21 Aug 2004 16:50:16 +0000 Subject: [PATCH] 2004-08-21 [colin] 0.9.12cvs74.2 * src/gtk/colorsel.c Fix bug 564 (Folder color selection window exits on any keypress) --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/colorsel.c | 13 +++++++++++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 6f2a24f29..2852a22ca 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2004-08-21 [colin] 0.9.12cvs74.2 + + * src/gtk/colorsel.c + Fix bug 564 (Folder color selection window exits on any + keypress) + 2004-08-21 [colin] 0.9.12cvs74.1 * ChangeLog.claws diff --git a/PATCHSETS b/PATCHSETS index 531fe9366..b483fa115 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -127,3 +127,4 @@ ( cvs diff -u -r 1.274.2.17 -r 1.274.2.18 src/mainwindow.c; cvs diff -u -r 1.94.2.29 -r 1.94.2.30 src/messageview.c; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/menu.c; cvs diff -u -r 1.23.2.4 -r 1.23.2.5 src/plugins/spamassassin/spamassassin_gtk.c; ) > 0.9.12cvs66.4.patchset ( cvs diff -u -r 1.2504.2.14 -r 1.2504.2.15 ChangeLog.claws; cvs diff -u -r 1.382.2.41 -r 1.382.2.42 src/compose.c; cvs diff -u -r 1.274.2.18 -r 1.274.2.19 src/mainwindow.c; ) > 0.9.12cvs70.1.patchset ( cvs diff -u -r 1.2504.2.15 -r 1.2504.2.16 ChangeLog.claws; cvs diff -u -r 1.382.2.42 -r 1.382.2.43 src/compose.c; cvs diff -u -r 1.395.2.27 -r 1.395.2.28 src/summaryview.c; cvs diff -u -r 1.43.2.8 -r 1.43.2.9 src/toolbar.c; ) > 0.9.12cvs74.1.patchset +( cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/colorsel.c; ) > 0.9.12cvs74.2.patchset diff --git a/configure.ac b/configure.ac index 1b078146a..86581a3d6 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=74 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.1 +EXTRA_GTK2_VERSION=.2 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/gtk/colorsel.c b/src/gtk/colorsel.c index 2896f9701..b5c9627a6 100644 --- a/src/gtk/colorsel.c +++ b/src/gtk/colorsel.c @@ -18,6 +18,7 @@ */ #include +#include #include "colorsel.h" #include "manage_window.h" @@ -38,8 +39,16 @@ static gboolean 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) -- 2.25.1