2006-01-16 [colin] 1.9.100cvs159

* src/compose.c
	* src/plugins/pgpcore/passphrase.c
		More buttons fixes
This commit is contained in:
Colin Leroy 2006-01-16 09:24:02 +00:00
parent b0df128db6
commit 26295424f3
5 changed files with 14 additions and 6 deletions

View file

@ -1,3 +1,9 @@
2006-01-16 [colin] 1.9.100cvs159
* src/compose.c
* src/plugins/pgpcore/passphrase.c
More buttons fixes
2006-01-16 [paul] 1.9.100cvs158
* src/prefs_actions.c

View file

@ -1142,3 +1142,4 @@
( cvs diff -u -r 1.207.2.84 -r 1.207.2.85 src/folderview.c; cvs diff -u -r 1.274.2.90 -r 1.274.2.91 src/mainwindow.c; ) > 1.9.100cvs156.patchset
( cvs diff -u -r 1.60.2.45 -r 1.60.2.46 src/addressbook.c; cvs diff -u -r 1.59.2.31 -r 1.59.2.32 src/prefs_filtering.c; ) > 1.9.100cvs157.patchset
( cvs diff -u -r 1.60.2.31 -r 1.60.2.32 src/prefs_actions.c; cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.33 -r 1.43.2.34 src/prefs_matcher.c; cvs diff -u -r 1.8.2.5 -r 1.8.2.6 src/quote_fmt.c; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/gtk/description_window.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/description_window.h; cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/gtk/quicksearch.c; ) > 1.9.100cvs158.patchset
( cvs diff -u -r 1.382.2.222 -r 1.382.2.223 src/compose.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpcore/passphrase.c; ) > 1.9.100cvs159.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=100
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=158
EXTRA_VERSION=159
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -3674,7 +3674,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
AlertValue aval;
aval = alertpanel(_("Send"),
_("The only recipient is the default CC address. Send anyway?"),
GTK_STOCK_CANCEL, _("_Send"), NULL);
GTK_STOCK_CANCEL, _("+_Send"), NULL);
if (aval != G_ALERTALTERNATE)
return FALSE;
}
@ -3702,7 +3702,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
AlertValue aval;
aval = alertpanel(_("Send"),
_("The only recipient is the default BCC address. Send anyway?"),
GTK_STOCK_CANCEL, _("_Send"), NULL);
GTK_STOCK_CANCEL, _("+_Send"), NULL);
if (aval != G_ALERTALTERNATE)
return FALSE;
}
@ -3729,7 +3729,7 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
aval = alertpanel(_("Send"),
_("Subject is empty. Send it anyway?"),
GTK_STOCK_CANCEL, _("_Send"), NULL);
GTK_STOCK_CANCEL, _("+_Send"), NULL);
if (aval != G_ALERTALTERNATE)
return FALSE;
}
@ -4124,7 +4124,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
msg = g_strdup_printf(_("Can't convert the character encoding of the message \n"
"to the specified %s charset.\n"
"Send it as %s?"), out_codeset, src_codeset);
aval = alertpanel_full(_("Error"), msg, GTK_STOCK_CANCEL, _("_Send"), NULL, FALSE,
aval = alertpanel_full(_("Error"), msg, GTK_STOCK_CANCEL, _("+_Send"), NULL, FALSE,
NULL, ALERT_ERROR, G_ALERTDEFAULT);
g_free(msg);

View file

@ -131,8 +131,9 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad)
gtk_entry_set_visibility(GTK_ENTRY(pass_entry), FALSE);
gtk_widget_grab_focus(pass_entry);
gtkut_stock_button_set_create(&confirm_box, &ok_button, GTK_STOCK_OK,
gtkut_stock_button_set_create(&confirm_box,
&cancel_button, GTK_STOCK_CANCEL,
&ok_button, GTK_STOCK_OK,
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_box, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_button);