2007-11-04 [paul] 3.0.2cvs114

	* src/gtk/gtkutils.c
		gtkut_stock_with_text_button_set_create(): set
		GTK_CAN_DEFAULT on buttons 2 and 3

diff --git a/ChangeLog b/ChangeLog
index ba307344b2b9246918457d470cc65ea79d0efb98..f9cbbb8a0bdccd58365337b30aa0c7d489fea0dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-04 [paul]      3.0.2cvs114
+
+       * src/gtk/gtkutils.c
+               gtkut_stock_with_text_button_set_create(): set
+               GTK_CAN_DEFAULT on buttons 2 and 3
+
 2007-11-03 [paul]      3.0.2cvs113
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index 8dfea97e57ace03ccd1bb6bbeac1fbcda2d18776..53412e2be2bd84b818dc6070579861e38039e37f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3026,3 +3026,4 @@
 ( cvs diff -u -r 1.60.2.103 -r 1.60.2.104 src/addressbook.c;  ) > 3.0.2cvs111.patchset
 ( cvs diff -u -r 1.100.2.56 -r 1.100.2.57 AUTHORS;  cvs diff -u -r 1.382.2.418 -r 1.382.2.419 src/compose.c;  cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/gtk/authors.h;  ) > 3.0.2cvs112.patchset
 ( cvs diff -u -r 1.36.2.121 -r 1.36.2.122 src/common/utils.c;  ) > 3.0.2cvs113.patchset
+( cvs diff -u -r 1.5.2.70 -r 1.5.2.71 src/gtk/gtkutils.c;  ) > 3.0.2cvs114.patchset

diff --git a/configure.ac b/configure.ac
index 48d3a7674ba4e5d8c6bd52f9a9bbccb6d9c2ed58..ec680119a47e796dd5cd21e880bbe3ce4fb4fb18 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=113
+EXTRA_VERSION=114
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 7bf39da1e78881275e5cca814ecbdecbdd68eb18..8f9b7d258b8437ac6bbbe9448a96ef837a139bc4 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -191,16 +191,19 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
 
        if (button2) {
                *button2 = gtk_button_new_with_mnemonic(text2);
-       gtk_button_set_image(GTK_BUTTON(*button2),
-               gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
+               gtk_button_set_image(GTK_BUTTON(*button2),
+                       gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
+                       GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
+               GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
                gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
                gtk_widget_show(*button2);
        }
 
        if (button3) {
                *button3 = gtk_button_new_with_mnemonic(text3);
-       gtk_button_set_image(GTK_BUTTON(*button3),
-               gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
+               gtk_button_set_image(GTK_BUTTON(*button3),
+                       gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
+               GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
                gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
                gtk_widget_show(*button3);
        }