+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
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=129
+EXTRA_VERSION=130
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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;
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},
/* 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;
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),
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);
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);
}
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);