2004-08-21 [colin] 0.9.12cvs74.2

	* src/gtk/colorsel.c
		Fix bug 564 (Folder color selection window exits on any
		keypress)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 6f2a24f29341a5c79c883515608537d3e16dd9a8..2852a22cabb1eef37c3611800815c405b5260cce 100644 (file)
--- 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 531fe9366087a306ed129ebf51781c8c3d3c9f19..b483fa115818b8977581cbc38b5fa155ab5bcd94 100644 (file)
--- 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 1b078146ab1c984acec8b1cf3eb0a94f24cee676..86581a3d6d69aaaa2fc052a1de681c8e0cc54ea8 100644 (file)
--- 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 2896f97014095bf62776c83543f8cd529a296ff8..b5c9627a6f6a7b2e517dd31bbdbf74009387ec65 100644 (file)
--- a/src/gtk/colorsel.c
+++ b/src/gtk/colorsel.c
@@ -18,6 +18,7 @@
  */
 
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 
 #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)