( 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
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);