2005-09-10 [colin] 1.9.14cvs18

	* src/plugins/pgpcore/select-keys.c
		Better order for the buttons

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 565f2336349e9756002a7192c36d68c71742b28a..433d62f9e3a2826612050e568d01d5dea2ed468b 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-09-10 [colin]     1.9.14cvs18
+
+       * src/plugins/pgpcore/select-keys.c
+               Better order for the buttons
+
 2005-09-10 [colin]     1.9.14cvs17
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 231ab0141e30ba5e760c27e89127049b42d1d7d5..e9d9984607c2d7d06d66b7cdcdf1cda9250f3b2f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -786,3 +786,4 @@
 ( cvs diff -u -r 1.43.2.24 -r 1.43.2.25 src/toolbar.c;  ) > 1.9.14cvs15.patchset
 ( cvs diff -u -r 1.382.2.163 -r 1.382.2.164 src/compose.c;  ) > 1.9.14cvs16.patchset
 ( cvs diff -u -r 1.382.2.164 -r 1.382.2.165 src/compose.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/select-keys.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/sgpgme.c;  ) > 1.9.14cvs17.patchset
+( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/select-keys.c;  ) > 1.9.14cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 764e2c02c6cbaa1bb06b03d45ff23e3be1047ba6..6bfca7519e852b9c9e9fb5dbc4a032b9f910ce1b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index be80dca83241c821f4c6f6e4b904a0596df38609..4b055552769ddcf237fb57081a1d152d1221bd0a 100644 (file)
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -353,13 +353,13 @@ create_dialog (struct select_keys_s *sk)
 
     gtkut_stock_button_set_create (&bbox, 
                                    &select_btn, _("Select"),
-                                   &cancel_btn, GTK_STOCK_CANCEL,
+                                  &other_btn, _("Other"),
                                   &dont_encrypt_btn, _("Don't encrypt"));
     
-    other_btn = gtk_button_new_from_stock(_("Other"));
-    GTK_WIDGET_SET_FLAGS(other_btn, GTK_CAN_DEFAULT);
-    gtk_box_pack_start(GTK_BOX(bbox), other_btn, TRUE, TRUE, 0);
-    gtk_widget_show(other_btn);
+    cancel_btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+    GTK_WIDGET_SET_FLAGS(cancel_btn, GTK_CAN_DEFAULT);
+    gtk_box_pack_start(GTK_BOX(bbox), cancel_btn, TRUE, TRUE, 0);
+    gtk_widget_show(cancel_btn);
     gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
     gtk_widget_grab_default (select_btn);