2007-08-18 [colin] 2.10.0cvs130
authorColin Leroy <colin@colino.net>
Sat, 18 Aug 2007 14:19:10 +0000 (14:19 +0000)
committerColin Leroy <colin@colino.net>
Sat, 18 Aug 2007 14:19:10 +0000 (14:19 +0000)
* 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
PATCHSETS
configure.ac
src/compose.c
src/prefs_common.c
src/prefs_common.h
src/prefs_send.c
src/send_message.c

index 9b33680d6e484e2c7a03814da98c7b0887df28dd..72c4fad3c77eec7e9baabb1b4da3e9c0b57e1a22 100644 (file)
--- 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
 2007-08-18 [paul]      2.10.0cvs129
 
        * src/summaryview.c
index 5fc78046b3da5f523b18f3362098b6720d41bdd4..83eecebd7b502dbec67cb9afa6d2670b339b1f9a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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.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
index 904a0aa36db28c26a7247138931450e74a6f02fe..a8110ae77caebaa5545b426976cfc421b337f0b8 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=129
+EXTRA_VERSION=130
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index ae5a530a764f9ef69d7cfd25221acbc36c39fa59..401635076df0bd582ed3838beb85fb8c5dca8b81 100644 (file)
@@ -4508,7 +4508,7 @@ gint compose_send(Compose *compose)
        MainWindow *mainwin = mainwindow_get_mainwindow();
        gboolean queued_removed = FALSE;
 
        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;
 
                        || compose->batch == TRUE)
                discard_window = TRUE;
 
index 2122a75aedc30c0ab51e45f7d8801d540bd83368..d3c9fe647a2ea1f5dd71066b260ad7aa221b8b67 100644 (file)
@@ -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},
         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},
         NULL, NULL, NULL},
        {"sendwin_width", "460", &prefs_common.sendwin_width, P_INT,
         NULL, NULL, NULL},
index 0fdfb2dfb47aaf343fcb9d42e3b580948b7a5af5..363ee7eb6364a0e310b933eae0222a021deac4dc 100644 (file)
@@ -115,7 +115,7 @@ struct _PrefsCommon
        /* Send */
        gboolean savemsg;
        gboolean confirm_send_queued_messages;
        /* 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;
        gint sendwin_width;
        gint sendwin_height;
        gchar *outgoing_charset;
index d4d314c4f4d875740b1abc9b0775d84406a7f8aa..d6255c80e8bdf4417fae975bcb4ac6f2928bdbe4 100644 (file)
@@ -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),
        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),
        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));
                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_TOGGLE_BUTTON(page->checkbtn_senddialog));
 
        g_free(prefs_common.outgoing_charset);
index ea564914cfd68e0f2b2929dfd201685a6c5ea578..e32f0f866096ba32ccc02553d71f771a14908c5f 100644 (file)
@@ -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);
 
        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);
        }
        
                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);
 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);
                progress_dialog_destroy(dialog->dialog);
        }
        g_free(dialog);