From b9504d1cf5b22c895fef58182abf0e42cbb0ee9f Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 18 Aug 2007 14:19:10 +0000 Subject: [PATCH] 2007-08-18 [colin] 2.10.0cvs130 * src/compose.c * src/prefs_common.c * src/prefs_common.h * src/prefs_send.c * src/send_message.c Revert 'send_dialog_mode' meaning to 'send_dialog_invisible', so that the new checkbox doesn't change the existing behaviour. --- ChangeLog | 12 ++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 2 +- src/prefs_common.c | 2 +- src/prefs_common.h | 2 +- src/prefs_send.c | 4 ++-- src/send_message.c | 4 ++-- 8 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b33680d6..72c4fad3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-08-18 [colin] 2.10.0cvs130 + + * src/compose.c + * src/prefs_common.c + * src/prefs_common.h + * src/prefs_send.c + * src/send_message.c + Revert 'send_dialog_mode' meaning to + 'send_dialog_invisible', so that the + new checkbox doesn't change the + existing behaviour. + 2007-08-18 [paul] 2.10.0cvs129 * src/summaryview.c diff --git a/PATCHSETS b/PATCHSETS index 5fc78046b..83eecebd7 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2784,3 +2784,4 @@ ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_send.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/combobox.h; cvs diff -u -r 1.5.2.65 -r 1.5.2.66 src/gtk/gtkutils.c; ) > 2.10.0cvs127.patchset ( cvs diff -u -r 1.213.2.155 -r 1.213.2.156 src/folder.c; ) > 2.10.0cvs128.patchset ( cvs diff -u -r 1.395.2.319 -r 1.395.2.320 src/summaryview.c; ) > 2.10.0cvs129.patchset +( cvs diff -u -r 1.382.2.402 -r 1.382.2.403 src/compose.c; cvs diff -u -r 1.204.2.146 -r 1.204.2.147 src/prefs_common.c; cvs diff -u -r 1.103.2.92 -r 1.103.2.93 src/prefs_common.h; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_send.c; cvs diff -u -r 1.17.2.40 -r 1.17.2.41 src/send_message.c; ) > 2.10.0cvs130.patchset diff --git a/configure.ac b/configure.ac index 904a0aa36..a8110ae77 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=129 +EXTRA_VERSION=130 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index ae5a530a7..401635076 100644 --- a/src/compose.c +++ b/src/compose.c @@ -4508,7 +4508,7 @@ gint compose_send(Compose *compose) MainWindow *mainwin = mainwindow_get_mainwindow(); gboolean queued_removed = FALSE; - if (!prefs_common.send_dialog_mode + if (prefs_common.send_dialog_invisible || compose->batch == TRUE) discard_window = TRUE; diff --git a/src/prefs_common.c b/src/prefs_common.c index 2122a75ae..d3c9fe647 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -187,7 +187,7 @@ static PrefParam param[] = { NULL, NULL, NULL}, {"confirm_send_queued_messages", "FALSE", &prefs_common.confirm_send_queued_messages, P_BOOL, NULL, NULL, NULL}, - {"send_dialog_mode", "0", &prefs_common.send_dialog_mode, P_BOOL, + {"send_dialog_mode", "0", &prefs_common.send_dialog_invisible, P_BOOL, NULL, NULL, NULL}, {"sendwin_width", "460", &prefs_common.sendwin_width, P_INT, NULL, NULL, NULL}, diff --git a/src/prefs_common.h b/src/prefs_common.h index 0fdfb2dfb..363ee7eb6 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -115,7 +115,7 @@ struct _PrefsCommon /* Send */ gboolean savemsg; gboolean confirm_send_queued_messages; - gboolean send_dialog_mode; + gboolean send_dialog_invisible; gint sendwin_width; gint sendwin_height; gchar *outgoing_charset; diff --git a/src/prefs_send.c b/src/prefs_send.c index d4d314c4f..d6255c80e 100644 --- a/src/prefs_send.c +++ b/src/prefs_send.c @@ -301,7 +301,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window, gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_never_send_retrcpt), prefs_common.never_send_retrcpt); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_senddialog), - prefs_common.send_dialog_mode); + !prefs_common.send_dialog_invisible); prefs_common_charset_set_optmenu(combobox_charset, prefs_common.outgoing_charset); combobox_select_by_data(GTK_COMBO_BOX(combobox_encoding), @@ -329,7 +329,7 @@ static void prefs_send_save(PrefsPage *_page) GTK_TOGGLE_BUTTON(page->checkbtn_confirm_send_queued_messages)); prefs_common.never_send_retrcpt = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_never_send_retrcpt)); - prefs_common.send_dialog_mode = gtk_toggle_button_get_active( + prefs_common.send_dialog_invisible = !gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_senddialog)); g_free(prefs_common.outgoing_charset); diff --git a/src/send_message.c b/src/send_message.c index ea564914c..e32f0f866 100644 --- a/src/send_message.c +++ b/src/send_message.c @@ -574,7 +574,7 @@ static SendProgressDialog *send_progress_dialog_create(void) gtk_widget_set_size_request(progress->window, prefs_common.sendwin_width, prefs_common.sendwin_height); - if (prefs_common.send_dialog_mode) { + if (!prefs_common.send_dialog_invisible) { gtk_widget_show_now(progress->window); } @@ -586,7 +586,7 @@ static SendProgressDialog *send_progress_dialog_create(void) static void send_progress_dialog_destroy(SendProgressDialog *dialog) { g_return_if_fail(dialog != NULL); - if (prefs_common.send_dialog_mode) { + if (!prefs_common.send_dialog_invisible) { progress_dialog_destroy(dialog->dialog); } g_free(dialog); -- 2.25.1