gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2005-07-17 [paul] 1.9.12cvs76

Browse source 
* src/account.c
	* src/addressbook.c
	* src/alertpanel.c
	* src/alertpanel.h
	* src/compose.c
	* src/exphtmldlg.c
	* src/expldifdlg.c
	* src/folderview.c
	* src/imap_gtk.c
	* src/inc.c
	* src/message_search.c
	* src/messageview.c
	* src/mh_gtk.c
	* src/news_gtk.c
	* src/prefs_actions.c
	* src/prefs_filtering.c
	* src/prefs_matcher.c
	* src/prefs_template.c
	* src/prefs_themes.c
	* src/ssl_manager.c
	* src/summary_search.c
	* src/textview.c
	* src/toolbar.c
	* src/gtk/sslcertwindow.c
	* src/plugins/pgpcore/sgpgme.c
		rework alertpanels
This commit is contained in:
Paul Mangan 2005-07-17 12:14:10 +00:00
parent 57592570b5
commit d4cffaa1b4
28 changed files with 224 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ChangeLog-gtk2.claws
View file

@ -1,3 +1,32 @@
2005-07-17 [paul] 1.9.12cvs76
* src/account.c
* src/addressbook.c
* src/alertpanel.c
* src/alertpanel.h
* src/compose.c
* src/exphtmldlg.c
* src/expldifdlg.c
* src/folderview.c
* src/imap_gtk.c
* src/inc.c
* src/message_search.c
* src/messageview.c
* src/mh_gtk.c
* src/news_gtk.c
* src/prefs_actions.c
* src/prefs_filtering.c
* src/prefs_matcher.c
* src/prefs_template.c
* src/prefs_themes.c
* src/ssl_manager.c
* src/summary_search.c
* src/textview.c
* src/toolbar.c
* src/gtk/sslcertwindow.c
* src/plugins/pgpcore/sgpgme.c
rework alertpanels
2005-07-17 [colin] 1.9.12cvs75
* src/privacy.c

1
PATCHSETS
View file

@ -670,3 +670,4 @@
( cvs diff -u -r 1.9.2.3 -r 1.9.2.4 src/gtk/sslcertwindow.c; ) > 1.9.12cvs73.patchset
( cvs diff -u -r 1.17.2.16 -r 1.17.2.17 src/alertpanel.c; ) > 1.9.12cvs74.patchset
( cvs diff -u -r 1.10.2.5 -r 1.10.2.6 src/privacy.c; ) > 1.9.12cvs75.patchset
( cvs diff -u -r 1.61.2.33 -r 1.61.2.34 src/account.c; cvs diff -u -r 1.60.2.20 -r 1.60.2.21 src/addressbook.c; cvs diff -u -r 1.17.2.17 -r 1.17.2.18 src/alertpanel.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/alertpanel.h; cvs diff -u -r 1.382.2.143 -r 1.382.2.144 src/compose.c; cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/exphtmldlg.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/expldifdlg.c; cvs diff -u -r 1.207.2.46 -r 1.207.2.47 src/folderview.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/imap_gtk.c; cvs diff -u -r 1.149.2.29 -r 1.149.2.30 src/inc.c; cvs diff -u -r 1.3.12.9 -r 1.3.12.10 src/message_search.c; cvs diff -u -r 1.94.2.57 -r 1.94.2.58 src/messageview.c; cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/mh_gtk.c; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/news_gtk.c; cvs diff -u -r 1.60.2.17 -r 1.60.2.18 src/prefs_actions.c; cvs diff -u -r 1.59.2.21 -r 1.59.2.22 src/prefs_filtering.c; cvs diff -u -r 1.43.2.20 -r 1.43.2.21 src/prefs_matcher.c; cvs diff -u -r 1.12.2.13 -r 1.12.2.14 src/prefs_template.c; cvs diff -u -r 1.3.2.20 -r 1.3.2.21 src/prefs_themes.c; cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/ssl_manager.c; cvs diff -u -r 1.15.2.16 -r 1.15.2.17 src/summary_search.c; cvs diff -u -r 1.96.2.63 -r 1.96.2.64 src/textview.c; cvs diff -u -r 1.43.2.20 -r 1.43.2.21 src/toolbar.c; cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/gtk/sslcertwindow.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/sgpgme.c; ) > 1.9.12cvs76.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=75
EXTRA_VERSION=76
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

5
src/account.c
View file

@ -944,8 +944,9 @@ static void account_delete(GtkWidget *widget, gpointer data)
_("Do you really want to delete the account '%s'?"),
ac_prefs->account_name ? ac_prefs->account_name :
_("(Untitled)"));
if (alertpanel(_("Delete account"), buf,
_("Yes"), _("+No"), NULL) != G_ALERTDEFAULT)
if (alertpanel_full(_("Delete account"), buf,
GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE) != G_ALERTDEFAULT)
return;
if (ac_prefs->folder) {

18
src/addressbook.c
View file

@ -3242,13 +3242,15 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) {
}
if( errFlag ) {
debug_print( "Error\n%s\n", msg );
alertpanel_with_type( _( "Addressbook conversion error" ), msg, GTK_STOCK_CLOSE,
NULL, NULL, NULL, ALERT_ERROR );
alertpanel_full(_("Addressbook conversion error"), msg,
GTK_STOCK_CLOSE, NULL, NULL, FALSE,
NULL, ALERT_ERROR, G_ALERTDEFAULT);
}
else if( msg ) {
debug_print( "Warning\n%s\n", msg );
alertpanel_with_type( _( "Addressbook conversion" ), msg, GTK_STOCK_CLOSE,
NULL, NULL, NULL, ALERT_WARNING );
alertpanel_full(_("Addressbook conversion error"), msg,
GTK_STOCK_CLOSE, NULL, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTDEFAULT);
}
return retVal;
@ -3284,10 +3286,10 @@ void addressbook_read_file( void ) {
/* Error reading address book */
debug_print( "Could not read address index.\n" );
addrindex_print_index( addrIndex, stdout );
alertpanel_with_type( _( "Addressbook Error" ),
_( "Could not read address index" ),
GTK_STOCK_CLOSE, NULL, NULL, NULL,
ALERT_ERROR);
alertpanel_full(_("Addressbook Error"),
_("Could not read address index"),
GTK_STOCK_CLOSE, NULL, NULL, FALSE,
NULL, ALERT_ERROR, G_ALERTDEFAULT);
}
debug_print( "done.\n" );
}

143
src/alertpanel.c
View file

@ -54,7 +54,8 @@ static void alertpanel_create (const gchar *title,
const gchar *button3_label,
gboolean can_disable,
GtkWidget *custom_widget,
gint alert_type);
gint alert_type,
AlertValue default_value);
static void alertpanel_button_toggled (GtkToggleButton *button,
gpointer data);
@ -67,17 +68,6 @@ static gboolean alertpanel_close (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
AlertValue alertpanel(const gchar *title,
const gchar *message,
const gchar *button1_label,
const gchar *button2_label,
const gchar *button3_label)
{
return alertpanel_with_type(title, message, button1_label,
button2_label, button3_label,
NULL, ALERT_QUESTION);
}
AlertValue alertpanel_with_widget(const gchar *title,
const gchar *message,
const gchar *button1_label,
@ -85,18 +75,20 @@ AlertValue alertpanel_with_widget(const gchar *title,
const gchar *button3_label,
GtkWidget *widget)
{
return alertpanel_with_type(title, message, button1_label,
return alertpanel_full(title, message, button1_label,
button2_label, button3_label,
widget, ALERT_QUESTION);
FALSE, widget, ALERT_QUESTION,
G_ALERTDEFAULT);
}
AlertValue alertpanel_with_type(const gchar *title,
const gchar *message,
const gchar *button1_label,
const gchar *button2_label,
const gchar *button3_label,
GtkWidget *widget,
gint alert_type)
AlertValue alertpanel_full(const gchar *title, const gchar *message,
const gchar *button1_label,
const gchar *button2_label,
const gchar *button3_label,
gboolean can_disable,
GtkWidget *widget,
AlertType alert_type,
AlertValue default_value)
{
if (alertpanel_is_open)
return -1;
@ -104,13 +96,25 @@ AlertValue alertpanel_with_type(const gchar *title,
alertpanel_is_open = TRUE;
alertpanel_create(title, message, button1_label, button2_label,
button3_label, FALSE, widget, alert_type);
button3_label, can_disable, widget, alert_type,
default_value);
alertpanel_show();
debug_print("return value = %d\n", value);
return value;
}
AlertValue alertpanel(const gchar *title,
const gchar *message,
const gchar *button1_label,
const gchar *button2_label,
const gchar *button3_label)
{
return alertpanel_full(title, message, button1_label, button2_label,
button3_label, FALSE, NULL, ALERT_QUESTION,
G_ALERTDEFAULT);
}
static void alertpanel_message(const gchar *title, const gchar *message, gint type)
{
if (alertpanel_is_open)
@ -118,29 +122,11 @@ static void alertpanel_message(const gchar *title, const gchar *message, gint ty
else
alertpanel_is_open = TRUE;
alertpanel_create(title, message, NULL, NULL, NULL, FALSE, NULL, type);
alertpanel_create(title, message, GTK_STOCK_CLOSE, NULL, NULL,
FALSE, NULL, type, G_ALERTDEFAULT);
alertpanel_show();
}
AlertValue alertpanel_message_with_disable(const gchar *title,
const gchar *message,
const gchar *button1_label,
const gchar *button2_label,
const gchar *button3_label,
gint alert_type)
{
if (alertpanel_is_open)
return 0;
else
alertpanel_is_open = TRUE;
alertpanel_create(title, message, button1_label, button2_label,
button3_label, TRUE, NULL, alert_type);
alertpanel_show();
return value;
}
void alertpanel_notice(const gchar *format, ...)
{
va_list args;
@ -199,7 +185,9 @@ void alertpanel_error_log(const gchar *format, ...)
mainwin = mainwindow_get_mainwindow();
if (mainwin && mainwin->logwin) {
val = alertpanel_with_type(_("Error"), buf, _("OK"), _("View log"), NULL, NULL, ALERT_ERROR);
val = alertpanel_full(_("Error"), buf, GTK_STOCK_OK,
_("View log"), NULL, FALSE, NULL,
ALERT_ERROR, G_ALERTDEFAULT);
if (val == G_ALERTALTERNATE)
log_window_show(mainwin->logwin);
} else
@ -232,11 +220,12 @@ static void alertpanel_create(const gchar *title,
const gchar *button3_label,
gboolean can_disable,
GtkWidget *custom_widget,
gint alert_type)
gint alert_type,
AlertValue default_value)
{
static PangoFontDescription *font_desc;
GtkWidget *image;
GtkWidget *label;
GtkWidget *w_hbox;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *disable_chkbtn;
@ -244,7 +233,6 @@ static void alertpanel_create(const gchar *title,
GtkWidget *button1;
GtkWidget *button2;
GtkWidget *button3;
GtkWidget *icon;
const gchar *label2;
const gchar *label3;
@ -252,11 +240,6 @@ static void alertpanel_create(const gchar *title,
"size=\"larger\">%s</span>",
title?title:"");
gchar *icon_desc[] = { GTK_STOCK_DIALOG_INFO,
GTK_STOCK_DIALOG_QUESTION,
GTK_STOCK_DIALOG_WARNING,
GTK_STOCK_DIALOG_ERROR };
debug_print("Creating alert panel dialog...\n");
dialog = gtk_dialog_new();
@ -269,29 +252,40 @@ static void alertpanel_create(const gchar *title,
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
g_signal_connect(G_OBJECT(dialog), "delete_event",
G_CALLBACK(alertpanel_deleted),
(gpointer)G_ALERTOTHER);
(gpointer)G_ALERTCANCEL);
g_signal_connect(G_OBJECT(dialog), "key_press_event",
G_CALLBACK(alertpanel_close),
(gpointer)G_ALERTOTHER);
(gpointer)G_ALERTCANCEL);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
FALSE, FALSE, 0);
/* for title icon, label and message */
hbox = gtk_hbox_new(FALSE, 12);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 12);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
hbox, FALSE, FALSE, 0);
/* title icon */
switch (alert_type) {
case ALERT_QUESTION:
image = gtk_image_new_from_stock
(GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
break;
case ALERT_WARNING:
image = gtk_image_new_from_stock
(GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
break;
case ALERT_ERROR:
image = gtk_image_new_from_stock
(GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
break;
case ALERT_NOTICE:
default:
image = gtk_image_new_from_stock
(GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
break;
}
gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.0);
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
/* for title label */
w_hbox = gtk_hbox_new(FALSE, 0);
if (alert_type < 0 || alert_type > 3)
alert_type = 0;
icon = gtk_image_new_from_stock(icon_desc[alert_type],
GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
@ -322,6 +316,7 @@ static void alertpanel_create(const gchar *title,
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_label_set_selectable(GTK_LABEL(label), TRUE);
GTK_WIDGET_UNSET_FLAGS(label, GTK_CAN_FOCUS);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
@ -330,7 +325,7 @@ static void alertpanel_create(const gchar *title,
gtk_box_pack_start(GTK_BOX(vbox), custom_widget, FALSE,
FALSE, 0);
}
if (can_disable) {
hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox,
@ -365,11 +360,13 @@ static void alertpanel_create(const gchar *title,
gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);
gtk_widget_grab_default(button1);
gtk_widget_grab_focus(button1);
if (button2_label && *button2_label == '+') {
if (button2_label &&
(default_value == G_ALERTALTERNATE || *button2_label == '+')) {
gtk_widget_grab_default(button2);
gtk_widget_grab_focus(button2);
}
if (button3_label && *button3_label == '+') {
if (button3_label &&
(default_value == G_ALERTOTHER || *button3_label == '+')) {
gtk_widget_grab_default(button3);
gtk_widget_grab_focus(button3);
}

24
src/alertpanel.h
View file

@ -27,6 +27,7 @@ typedef enum
G_ALERTDEFAULT,
G_ALERTALTERNATE,
G_ALERTOTHER,
G_ALERTCANCEL,
G_ALERTWAIT,
G_ALERTDISABLE = 1 << 16
@ -41,6 +42,15 @@ typedef enum
} AlertType;
#define G_ALERT_VALUE_MASK 0x0000ffff
AlertValue alertpanel_full(const gchar *title, const gchar *message,
const gchar *button1_label,
const gchar *button2_label,
const gchar *button3_label,
gboolean can_disable,
GtkWidget *widget,
AlertType alert_type,
AlertValue default_value);
AlertValue alertpanel (const gchar *title,
const gchar *message,
const gchar *button1_label,
@ -54,20 +64,6 @@ AlertValue alertpanel_with_widget (const gchar *title,
const gchar *button3_label,
GtkWidget *widget);
AlertValue alertpanel_with_type (const gchar *title,
const gchar *message,
const gchar *button1_label,
const gchar *button2_label,
const gchar *button3_label,
GtkWidget *widget,
gint alert_type);
AlertValue alertpanel_message_with_disable (const gchar *title,
const gchar *message,
const gchar *button1_label,
const gchar *button2_label,
const gchar *button3_label,
gint alert_type);
void alertpanel_notice (const gchar *format,
...) G_GNUC_PRINTF(1, 2);

12
src/compose.c
View file

@ -3607,9 +3607,9 @@ 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 from\n"
"%s to %s.\n"
"Send it anyway?"), src_codeset, out_codeset);
aval = alertpanel_with_type
(_("Error"), msg, _("Yes"), _("+No"), NULL, NULL, ALERT_ERROR);
g_free(msg);
aval = alertpanel_full(_("Error"), msg, GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
NULL, ALERT_ERROR, G_ALERTALTERNATE);
g_free(msg);
if (aval != G_ALERTDEFAULT) {
g_free(chars);
@ -6093,7 +6093,9 @@ static gboolean compose_ext_editor_kill(Compose *compose)
(_("The external editor is still working.\n"
"Force terminating the process?\n"
"process group id: %d"), -pgid);
val = alertpanel(_("Notice"), msg, _("Yes"), _("+No"), NULL);
val = alertpanel_full(_("Notice"), msg, GTK_STOCK_YES, GTK_STOCK_NO,
NULL, FALSE, NULL, ALERT_WARNING, G_ALERTALTERNATE);
g_free(msg);
if (val == G_ALERTDEFAULT) {
@ -6380,7 +6382,7 @@ static void compose_send_cb(gpointer data, guint action, GtkWidget *widget)
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return;
if (compose->draft_timeout_tag != -1) { /* CLAWS: disable draft timeout */

7
src/exphtmldlg.c
View file

@ -183,7 +183,7 @@ static gboolean exp_html_move_file( void ) {
"does not exist. OK to create new directory?" ),
_exportCtl_->dirOutput );
aval = alertpanel( _("Create Directory" ),
msg, _( "Yes" ), _( "No" ), NULL );
msg, GTK_STOCK_YES, GTK_STOCK_NO, NULL );
g_free( msg );
if( aval != G_ALERTDEFAULT ) return FALSE;
@ -193,8 +193,9 @@ static gboolean exp_html_move_file( void ) {
msg = g_strdup_printf( _(
"Could not create output directory for HTML file:\n%s" ),
reason );
aval = alertpanel_with_type( _( "Failed to Create Directory" ),
msg, _( "Close" ), NULL, NULL, NULL, ALERT_ERROR );
aval = alertpanel_full(_("Failed to Create Directory"), msg,
GTK_STOCK_CLOSE, NULL, NULL, FALSE,
NULL, ALERT_ERROR, G_ALERTDEFAULT);
g_free( msg );
return FALSE;
}

9
src/expldifdlg.c
View file

@ -190,7 +190,7 @@ static gboolean exp_ldif_move_file( void ) {
"does not exist. OK to create new directory?" ),
_exportCtl_->dirOutput );
aval = alertpanel( _("Create Directory" ),
msg, _( "Yes" ), _( "No" ), NULL );
msg, GTK_STOCK_YES, GTK_STOCK_NO, NULL );
g_free( msg );
if( aval != G_ALERTDEFAULT ) return FALSE;
@ -200,8 +200,9 @@ static gboolean exp_ldif_move_file( void ) {
msg = g_strdup_printf( _(
"Could not create output directory for LDIF file:\n%s" ),
reason );
aval = alertpanel_with_type( _( "Failed to Create Directory" ),
msg, _( "Close" ), NULL, NULL, NULL, ALERT_ERROR );
aval = alertpanel_full(_("Failed to Create Directory"), msg,
GTK_STOCK_CLOSE, NULL, NULL, FALSE,
NULL, ALERT_ERROR, G_ALERTDEFAULT);
g_free( msg );
return FALSE;
}
@ -248,7 +249,7 @@ static gboolean exp_ldif_move_dn( void ) {
"for an LDAP server. Are you sure you wish " \
"to proceed without a suffix?"
),
_( "Yes" ), _( "No" ), NULL );
GTK_STOCK_YES, GTK_STOCK_NO, NULL );
if( aval != G_ALERTDEFAULT ) {
gtk_widget_grab_focus( expldif_dlg.entrySuffix );
errFlag = TRUE;

7
src/folderview.c
View file

@ -1868,7 +1868,7 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
if (prefs_common.ask_on_clean) {
if (alertpanel(_("Empty trash"),
_("Empty all messages in trash?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return;
}
@ -1952,8 +1952,9 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
buf = g_strdup_printf(_("Do you really want to make folder '%s' a "
"sub-folder of '%s' ?"), from_folder->name,
to_folder->name);
status = alertpanel_message_with_disable(_("Move folder"), buf,
_("Yes"), _("No"), NULL, ALERT_QUESTION);
status = alertpanel_full(_("Move folder"), buf,
GTK_STOCK_YES, GTK_STOCK_NO, NULL, TRUE,
NULL, ALERT_QUESTION, G_ALERTALTERNATE);
g_free(buf);
if (status != G_ALERTDEFAULT

14
src/gtk/sslcertwindow.c
View file

@ -226,7 +226,8 @@ void sslcertwindow_show_cert(SSLCertificate *cert)
gchar *buf;
buf = g_strdup_printf(_("SSL certificate for %s"), cert->host);
alertpanel_with_type(buf, NULL, _("OK"), NULL, NULL, cert_widget, ALERT_NOTICE);
alertpanel_full(buf, NULL, GTK_STOCK_CLOSE, NULL, NULL,
FALSE, cert_widget, ALERT_NOTICE, G_ALERTDEFAULT);
g_free(buf);
}
@ -240,7 +241,7 @@ gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert)
GtkWidget *cert_widget;
vbox = gtk_vbox_new(FALSE, 5);
buf = g_strdup_printf(_("Certificate for %s is unknown. Do you want to accept it?"), cert->host);
buf = g_strdup_printf(_("Certificate for %s is unknown.\nDo you want to accept it?"), cert->host);
label = gtk_label_new(buf);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
@ -262,7 +263,10 @@ gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert)
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
cert_widget = cert_presenter(cert);
gtk_container_add(GTK_CONTAINER(button), cert_widget);
val = alertpanel_with_type(_("Unknown SSL Certificate"), NULL, _("Accept and save"), _("Cancel connection"), NULL, vbox, ALERT_QUESTION);
val = alertpanel_full(_("Unknown SSL Certificate"), NULL,
_("Accept and save"), _("Cancel connection"), NULL,
FALSE, vbox, ALERT_QUESTION, G_ALERTDEFAULT);
return (val == G_ALERTDEFAULT);
}
@ -313,7 +317,9 @@ gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCertificate
gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(button), vbox);
val = alertpanel_with_type(_("Changed SSL Certificate"), NULL, _("Accept and save"), _("Cancel connection"), NULL, vbox2, ALERT_WARNING);
val = alertpanel_full(_("Changed SSL Certificate"), NULL,
_("Accept and save"), _("Cancel connection"), NULL,
FALSE, vbox2, ALERT_WARNING, G_ALERTDEFAULT);
return (val == G_ALERTDEFAULT);
}

12
src/imap_gtk.c
View file

@ -267,8 +267,9 @@ static void remove_server_cb(FolderView *folderview, guint action, GtkWidget *wi
name = trim_string(item->folder->name, 32);
message = g_strdup_printf(_("Really delete IMAP4 account '%s'?"), name);
avalue = alertpanel(_("Delete IMAP4 account"), message,
_("Yes"), _("+No"), NULL);
avalue = alertpanel_full(_("Delete IMAP4 account"), message,
GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE);
g_free(message);
g_free(name);
@ -315,8 +316,9 @@ static void delete_folder_cb(FolderView *folderview, guint action,
(_("All folders and messages under '%s' will be permanently deleted. "
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel(_("Delete folder"), message,
_("Yes"), _("+No"), NULL);
avalue = alertpanel_full(_("Delete folder"), message,
GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE);
g_free(message);
if (avalue != G_ALERTDEFAULT) return;
@ -411,7 +413,7 @@ gboolean imap_gtk_should_override(void)
answer = (alertpanel(_("Offline warning"),
_("You're working offline. Override during 10 minutes?"),
_("Yes"), _("No"), NULL) == G_ALERTDEFAULT);
GTK_STOCK_YES, GTK_STOCK_NO, NULL) == G_ALERTDEFAULT);
if (answer == TRUE)
overridden_yes = time(NULL);

6
src/inc.c
View file

@ -176,7 +176,7 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return;
inc_lock();
@ -281,7 +281,7 @@ gint inc_account_mail(MainWindow *mainwin, PrefsAccount *account)
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return 0;
inc_autocheck_timer_remove();
@ -307,7 +307,7 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return;
if (inc_lock_count) return;

9
src/message_search.c
View file

@ -197,11 +197,10 @@ static void message_search_execute(gboolean backward)
}
if (all_searched) {
alertpanel_with_type
(_("Search failed"),
_("Search string not found."),
NULL, NULL, NULL, NULL,
ALERT_WARNING);
alertpanel_full(_("Search failed"),
_("Search string not found."),
GTK_STOCK_CLOSE, NULL, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTDEFAULT);
break;
}

25
src/messageview.c
View file

@ -550,8 +550,9 @@ static gint disposition_notification_send(MsgInfo *msginfo)
"Return path: %s\n"
"It is advised to not to send the return "
"receipt."), to, buf);
val = alertpanel_with_type(_("Warning"), message, _("Send"),
_("+Don't Send"), NULL, NULL, ALERT_WARNING);
val = alertpanel_full(_("Warning"), message,
_("Send"), _("+Don't Send"), NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE);
g_free(message);
if (val != G_ALERTDEFAULT)
return -1;
@ -562,16 +563,16 @@ static gint disposition_notification_send(MsgInfo *msginfo)
if (ac_list == NULL) {
AlertValue val =
alertpanel_with_type(_("Warning"),
alertpanel_full(_("Warning"),
_("This message is asking for a return "
"receipt notification\n"
"but according to its 'To:' and 'CC:' "
"headers it was not\nofficially addressed "
"to you.\n"
"It is advised to not to send the return ."
"receipt."),
_("Send"), _("+Don't Send"), NULL,
NULL, ALERT_WARNING);
"receipt notification\n"
"but according to its 'To:' and 'CC:' "
"headers it was not\nofficially addressed "
"to you.\n"
"It is advised to not to send the return ."
"receipt."),
_("Send"), _("+Don't Send"),NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE);
if (val != G_ALERTDEFAULT)
return -1;
}
@ -691,7 +692,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return 0;
/* send it */

11
src/mh_gtk.c
View file

@ -167,8 +167,9 @@ static void delete_folder_cb(FolderView *folderview, guint action,
(_("All folders and messages under '%s' will be permanently deleted. "
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel_with_type(_("Delete folder"), message,
_("Yes"), _("+No"), NULL, NULL, ALERT_WARNING);
avalue = alertpanel_full(_("Delete folder"), message,
GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE);
g_free(message);
if (avalue != G_ALERTDEFAULT) return;
@ -310,8 +311,10 @@ static void remove_mailbox_cb(FolderView *folderview, guint action,
message = g_strdup_printf
(_("Really remove the mailbox '%s' ?\n"
"(The messages are NOT deleted from the disk)"), name);
avalue = alertpanel(_("Remove mailbox"), message,
_("Yes"), _("+No"), NULL);
avalue = alertpanel_full(_("Remove mailbox"), message,
GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE);
g_free(message);
g_free(name);
if (avalue != G_ALERTDEFAULT) return;

10
src/news_gtk.c
View file

@ -202,8 +202,9 @@ static void unsubscribe_newsgroup_cb(FolderView *folderview, guint action,
name = trim_string(item->path, 32);
message = g_strdup_printf(_("Really unsubscribe newsgroup '%s'?"), name);
avalue = alertpanel(_("Unsubscribe newsgroup"), message,
_("Yes"), _("+No"), NULL);
avalue = alertpanel_full(_("Unsubscribe newsgroup"), message,
GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE);
g_free(message);
g_free(name);
if (avalue != G_ALERTDEFAULT) return;
@ -251,8 +252,9 @@ static void remove_news_server_cb(FolderView *folderview, guint action,
name = trim_string(item->folder->name, 32);
message = g_strdup_printf(_("Really delete news account '%s'?"), name);
avalue = alertpanel(_("Delete news account"), message,
_("Yes"), _("+No"), NULL);
avalue = alertpanel_full(_("Delete news account"), message,
GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE);
g_free(message);
g_free(name);

9
src/plugins/pgpcore/sgpgme.c
View file

@ -366,12 +366,13 @@ void sgpgme_init()
if (prefs_gpg_get_config()->gpg_warning) {
AlertValue val;
val = alertpanel_message_with_disable
val = alertpanel_full
(_("Warning"),
_("GnuPG is not installed properly, or needs "
"to be upgraded.\n"
"OpenPGP support disabled."),
NULL, NULL, NULL, ALERT_WARNING);
"to be upgraded.\n"
"OpenPGP support disabled."),
GTK_STOCK_CLOSE, NULL, NULL, TRUE, NULL,
ALERT_WARNING, G_ALERTDEFAULT);
if (val & G_ALERTDISABLE)
prefs_gpg_get_config()->gpg_warning = FALSE;
}

4
src/prefs_actions.c
View file

@ -690,7 +690,7 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data)
{
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT) {
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT) {
return;
}
modified = FALSE;
@ -709,7 +709,7 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT) {
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT) {
return;
}
modified = FALSE;

4
src/prefs_filtering.c
View file

@ -875,7 +875,7 @@ static void prefs_filtering_delete_cb(void)
if (alertpanel(_("Delete rule"),
_("Do you really want to delete this rule?"),
_("Yes"), _("No"), NULL) == G_ALERTALTERNATE)
GTK_STOCK_YES, GTK_STOCK_NO, NULL) == G_ALERTALTERNATE)
return;
model = gtk_tree_view_get_model(list_view);
@ -1032,7 +1032,7 @@ static void prefs_filtering_ok(void)
if (!filtering_str) {
val = alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
_("Yes"), _("No"), NULL);
GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (G_ALERTDEFAULT != val) {
g_free(filtering_str);
g_free(str); /* fixed two leaks: huzzah! */

2
src/prefs_matcher.c
View file

@ -1602,7 +1602,7 @@ static void prefs_matcher_ok(void)
if (!matcher_str || strcmp(matcher_str, str) != 0) {
val = alertpanel(_("Entry not saved"),
_("The entry was not saved\nHave you really finished?"),
_("Yes"), _("No"), NULL);
GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (G_ALERTDEFAULT != val) {
g_free(matcher_str);
g_free(str);

4
src/prefs_template.c
View file

@ -370,7 +370,7 @@ static void prefs_template_ok_cb(void)
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT) {
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT) {
return;
}
modified = FALSE;
@ -386,7 +386,7 @@ static void prefs_template_cancel_cb(void)
{
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT) {
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT) {
return;
}
modified = FALSE;

6
src/prefs_themes.c
View file

@ -431,7 +431,7 @@ static void prefs_themes_btn_remove_clicked_cb(GtkWidget *widget, gpointer data)
val = alertpanel(alert_title,
_("Are you sure you want to remove this theme?"),
_("No"), _("Yes"), _("Cancel"));
GTK_STOCK_YES, GTK_STOCK_NO, GTK_STOCK_CANCEL);
g_free(alert_title);
if (G_ALERTALTERNATE == val) {
gchar *status = NULL;
@ -486,14 +486,14 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
if (file_exist(themeinfo, FALSE) == FALSE) {
val = alertpanel(alert_title,
_("This folder doesn't seem to be a theme folder.\nInstall anyway?"),
_("Yes"), _("No"), _("Cancel"));
GTK_STOCK_YES, GTK_STOCK_NO, GTK_STOCK_CANCEL);
if (G_ALERTDEFAULT != val)
goto end_inst;
}
if (getuid() == 0) {
val = alertpanel(alert_title,
_("Do you want to install theme for all users?"),
_("Yes"), _("No"), _("Cancel"));
GTK_STOCK_YES, GTK_STOCK_NO, GTK_STOCK_CANCEL);
switch (val) {
case G_ALERTDEFAULT:
cinfo->dest = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,

9
src/ssl_manager.c
View file

@ -370,9 +370,12 @@ static void ssl_manager_delete_cb(GtkWidget *widget,
if (!cert)
return;
val = alertpanel(_("Delete certificate"),
_("Do you really want to delete this certificate?"),
_("Yes"), _("+No"), NULL);
val = alertpanel_full(_("Delete certificate"),
_("Do you really want to delete this certificate?"),
GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE);
if (val != G_ALERTDEFAULT)
return;

9
src/summary_search.c
View file

@ -374,11 +374,10 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
}
if (all_searched) {
alertpanel_with_type
(_("Search failed"),
_("Search string not found."),
NULL, NULL, NULL, NULL,
ALERT_WARNING);
alertpanel_full(_("Search failed"),
_("Search string not found."),
GTK_STOCK_CLOSE, NULL, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTDEFAULT);
break;
}

6
src/textview.c
View file

@ -2213,9 +2213,9 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
"\n"
"Open it anyway?"),
uri->uri, visible_str);
aval = alertpanel_with_type(_("Fake URL warning"), msg,
GTK_STOCK_YES, GTK_STOCK_NO,
NULL, NULL, ALERT_WARNING);
aval = alertpanel_full(_("Fake URL warning"), msg,
GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTALTERNATE);
g_free(msg);
if (aval == G_ALERTDEFAULT)
retval = TRUE;

4
src/toolbar.c
View file

@ -1914,7 +1914,7 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return;
/* ask for confirmation before sending queued messages only
@ -1933,7 +1933,7 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
if (found && !prefs_common.work_offline) {
if (alertpanel(_("Send queued messages"),
_("Send all queued messages?"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return;
}
}