2006-01-31 [cleroy] 2.0.0cvs3

	* src/plugins/pgpcore/passphrase.c
		Convert passphrase to locale encoding
	* src/compose.c
		Fix drafting on IMAP. Crappy bug sneaked in
		the release :-/

diff --git a/ChangeLog b/ChangeLog
index 2ece88daa61047d2030104af702d6285dd07775d..ce4a1fd1123316cce683bc3a87a61f76c8e64097 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-31 [cleroy]    2.0.0cvs3
+
+       * src/plugins/pgpcore/passphrase.c
+               Convert passphrase to locale encoding
+       * src/compose.c
+               Fix drafting on IMAP. Crappy bug sneaked in
+               the release :-/
+

 2006-01-30 [paul]      2.0.0cvs2
 
        * src/gtk/icon_legend.c
 2006-01-30 [paul]      2.0.0cvs2
 
        * src/gtk/icon_legend.c

diff --git a/PATCHSETS b/PATCHSETS
index ec07c4fe301c305a87e359b28d0aabd1c0c287d1..3e426977d3c4baeff024f3d8202c25c49a43a599 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1186,3 +1186,4 @@
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/faq.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/gpl.xml;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/intro.xml;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/starting.xml;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/sylpheed-claws-manual.xml;  ) > 1.9.100cvs200.patchset
 ( cvs diff -u -r 1.11.2.7 -r 1.11.2.8 src/manual.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/icon_legend.c;  ) > 2.0.0cvs1.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/icon_legend.c;  ) > 2.0.0cvs2.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/faq.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/gpl.xml;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/intro.xml;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/starting.xml;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/sylpheed-claws-manual.xml;  ) > 1.9.100cvs200.patchset
 ( cvs diff -u -r 1.11.2.7 -r 1.11.2.8 src/manual.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/icon_legend.c;  ) > 2.0.0cvs1.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/icon_legend.c;  ) > 2.0.0cvs2.patchset

+( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.382.2.230 -r 1.382.2.231 src/compose.c;  ) > 2.0.0cvs3.patchset

diff --git a/configure.ac b/configure.ac
index 8b2fa8fbf17c5683134d43500d5613a852c92ed8..aaf96c69d9cc421df829018497683118ddd90cbe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=2
+EXTRA_VERSION=3

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index b43e508b1d853de0f2cf6f4c8c4cec9e0a89f0d0..2921e0635591b6d10f2468f71c4a97cae913a293 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -7106,6 +7106,7 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
                target_locked = MSG_IS_LOCKED(compose->targetinfo->flags);
                flag.perm_flags = target_locked?MSG_LOCKED:0;
        }
                target_locked = MSG_IS_LOCKED(compose->targetinfo->flags);
                flag.perm_flags = target_locked?MSG_LOCKED:0;
        }

+       flag.tmp_flags = MSG_DRAFT;

 
        folder_item_scan(draft);
        if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
 
        folder_item_scan(draft);
        if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index 4535fd67fe297adddd886165cc16567bbf47c742..93a3b776cd36395029b560c024ce9ca8f1d99098 100644 (file)
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -197,7 +197,8 @@ try_again:
     if (pass_ack) {
         const gchar *entry_text;
         entry_text = gtk_entry_get_text(GTK_ENTRY(pass_entry));
     if (pass_ack) {
         const gchar *entry_text;
         entry_text = gtk_entry_get_text(GTK_ENTRY(pass_entry));

-        if (entry_text) /* Hmmm: Do we really need this? */
+       the_passphrase = g_locale_from_utf8(entry_text, -1, NULL, NULL, NULL);
+        if (the_passphrase == NULL) 

             the_passphrase = g_strdup (entry_text);
     }
     gtk_widget_destroy (window);
             the_passphrase = g_strdup (entry_text);
     }
     gtk_widget_destroy (window);