2006-08-21 [colin] 2.4.0cvs67

	* src/alertpanel.c
	* src/gtk/inputdialog.c
	* src/plugins/pgpcore/passphrase.c
		Set minimal width to 375
	* src/mainwindow.c
		Fix switching to offline, asking if it
		should be overriden for synchronising
	* src/mimeview.c
		Don't offer to remember command on Open
		with for text parts, as the browser or
		text editor command isn't changed from
		there

diff --git a/ChangeLog b/ChangeLog
index d09af9573b98e15e1ab380be976538a260fb34ad..12e3110a38ab3d6972c045eab497510a9b5aab79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-08-21 [colin]     2.4.0cvs67
+
+       * src/alertpanel.c
+       * src/gtk/inputdialog.c
+       * src/plugins/pgpcore/passphrase.c
+               Set minimal width to 375
+       * src/mainwindow.c
+               Fix switching to offline, asking if it 
+               should be overriden for synchronising
+       * src/mimeview.c
+               Don't offer to remember command on Open 
+               with for text parts, as the browser or 
+               text editor command isn't changed from 
+               there
+
 2006-08-20 [paul]      2.4.0cvs66
 
        * po/ko.po

diff --git a/PATCHSETS b/PATCHSETS
index c5590733bdf180c3732c8c9cb53a8de6dfb446cf..4acda7fa3f81909a2b2dad8e45d2b71c9293e7da 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1758,3 +1758,4 @@
 ( cvs diff -u -r 1.25.2.24 -r 1.25.2.25 src/stock_pixmap.c;  ) > 2.4.0cvs64.patchset
 ( cvs diff -u -r 1.25.2.25 -r 1.25.2.26 src/stock_pixmap.c;  ) > 2.4.0cvs65.patchset
 ( cvs diff -u -r 1.8.2.6 -r 1.8.2.7 po/ko.po;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 po/zh_CN.po;  ) > 2.4.0cvs66.patchset
+( cvs diff -u -r 1.17.2.24 -r 1.17.2.25 src/alertpanel.c;  cvs diff -u -r 1.274.2.138 -r 1.274.2.139 src/mainwindow.c;  cvs diff -u -r 1.83.2.80 -r 1.83.2.81 src/mimeview.c;  cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpcore/passphrase.c;  ) > 2.4.0cvs67.patchset

diff --git a/configure.ac b/configure.ac
index ed0a66eaea1a58e59016873d6882323269ef2711..14df1218d6bb75cf13adcdc232199071bcd4aa75 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=66
+EXTRA_VERSION=67
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/alertpanel.c b/src/alertpanel.c
index 230e9c7669fb232bdb089c60a2711457be67cb87..72dd2b25d07d9eb69ad41c61be22009be19caca2 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -357,6 +357,8 @@ static void alertpanel_create(const gchar *title,
                                      button2_label ? &button2 : NULL, label2,
                                      button3_label ? &button3 : NULL, label3);
 
+       gtk_widget_set_size_request(confirm_area, 375, -1);
+
        gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
                         confirm_area, FALSE, FALSE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);

diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
index 1b40c1fb67a5b3b0c4e78de28a135b0166366585..c1bb718a406adccc2d8e32d3953c88923e97067d 100644 (file)
--- a/src/gtk/inputdialog.c
+++ b/src/gtk/inputdialog.c
@@ -281,6 +281,8 @@ static void input_dialog_create(gboolean is_password)
                                      &ok_button, GTK_STOCK_OK,
                                      NULL, NULL);
 
+       gtk_widget_set_size_request(confirm_area, 375, -1);
+
        gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
                         confirm_area, FALSE, FALSE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 8c27cc4674ba3337808a98093a5fabadc2fcf7e8..d974cca8648968ba121560d91435b200ffe278f6 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3187,8 +3187,8 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
                /* go offline */
                if (prefs_common.work_offline)
                        return;
-               prefs_common.work_offline = TRUE;
                mainwindow_check_synchronise(mainwin, TRUE);
+               prefs_common.work_offline = TRUE;
                imap_disconnect_all();
        } else {
                /*go online */

diff --git a/src/mimeview.c b/src/mimeview.c
index d6b79c11b48bceaccc52946d4e9cec8b0462ab5f..84b51e6df7e892a4c05bb84e8fff7dc7c29c3f4d 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1644,14 +1644,18 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
        }
        
        if ((partinfo->type == MIMETYPE_TEXT && !strcmp(partinfo->subtype, "html"))
-       && prefs_common.uri_cmd && prefs_common.uri_cmd[0])
+       && prefs_common.uri_cmd && prefs_common.uri_cmd[0]) {
                mime_command = g_strdup(prefs_common.uri_cmd);
-       else if (partinfo->type != MIMETYPE_TEXT || !prefs_common.ext_editor_cmd
-       ||  !prefs_common.ext_editor_cmd[0])
+               g_free(content_type);
+               content_type = NULL;
+       } else if (partinfo->type != MIMETYPE_TEXT || !prefs_common.ext_editor_cmd
+       ||  !prefs_common.ext_editor_cmd[0]) {
                mime_command = mailcap_get_command_for_type(content_type, filename);
-       else
+       } else {
                mime_command = g_strdup(prefs_common.ext_editor_cmd);
-
+               g_free(content_type);
+               content_type = NULL;
+       }
        if (mime_command == NULL) {
                /* try with extension this time */
                g_free(content_type);

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index 12b4d968858dbf0fddac2d195185daff0f31bd0f..e115abd512883b8cfe2f6638b79cf99002fbf533 100644 (file)
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -133,6 +133,9 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi
                                  &cancel_button, GTK_STOCK_CANCEL,
                                  &ok_button, GTK_STOCK_OK,
                                  NULL, NULL);
+
+    gtk_widget_set_size_request(confirm_box, 375, -1);
+
     gtk_box_pack_end(GTK_BOX(vbox), confirm_box, FALSE, FALSE, 0);
     gtk_widget_grab_default(ok_button);