talons

commit c1172c548a18b4161b965b57371239ca38e2c565
parent f04aaa4cb1ed092b76bf60190a3d8f8cdcafed9e
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 11 Aug 2015 14:45:08 +0200

Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws

Diffstat:
M
manual/advanced.xml
 | 
10
++++++++++
M
src/compose.c
 | 
4
++++
M
src/plugins/pgpmime/pgpmime.c
 | 
6
++++--
M
src/plugins/smime/smime.c
 | 
6
++++--
M
src/prefs_common.c
 | 
2
++
M
src/prefs_common.h
 | 
1
+

6 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/manual/advanced.xml b/manual/advanced.xml
@@ -841,6 +841,16 @@
 	</listitem>
       </varlistentry>
       <varlistentry>
+    <term><literal>type_any_header</literal></term>
+    <listitem>
+      <para>
+    Allows to type any header on the compose window header entries.
+    By default only the entries available from the combobox can be
+    selected.
+      </para>
+    </listitem>
+      </varlistentry>
+      <varlistentry>
 	<term><literal>two_line_vertical</literal></term>
 	<listitem>
 	  <para>
diff --git a/src/compose.c b/src/compose.c
@@ -6963,6 +6963,10 @@ static void compose_create_header_entry(Compose *compose)
 	if (header)
 		gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((combo)))), header);
 
+	gtk_editable_set_editable(
+		GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((combo)))),
+		prefs_common.type_any_header);
+
 	g_signal_connect_after(G_OBJECT(gtk_bin_get_child(GTK_BIN((combo)))), "grab_focus",
 			 G_CALLBACK(compose_grab_focus_cb), compose);
 
diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
@@ -544,8 +544,10 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account, const gchar *fr
 	if (result && result->signatures) {
 		gpgme_new_signature_t sig = result->signatures;
 		if (gpgme_get_protocol(ctx) == GPGME_PROTOCOL_OpenPGP) {
-			micalg = g_strdup_printf("pgp-%s", g_ascii_strdown(gpgme_hash_algo_name(
-				result->signatures->hash_algo),-1));
+			gchar *down_algo = g_ascii_strdown(gpgme_hash_algo_name(
+				result->signatures->hash_algo), -1);
+			micalg = g_strdup_printf("pgp-%s", down_algo);
+			g_free(down_algo);
 		} else {
 			micalg = g_strdup(gpgme_hash_algo_name(
 				result->signatures->hash_algo));
diff --git a/src/plugins/smime/smime.c b/src/plugins/smime/smime.c
@@ -642,8 +642,10 @@ gboolean smime_sign(MimeInfo *mimeinfo, PrefsAccount *account, const gchar *from
 	result = gpgme_op_sign_result(ctx);
 	if (result && result->signatures) {
 	    if (gpgme_get_protocol(ctx) == GPGME_PROTOCOL_OpenPGP) {
-		micalg = g_strdup_printf("pgp-%s", g_ascii_strdown(gpgme_hash_algo_name(
-			    result->signatures->hash_algo),-1));
+		gchar *down_algo = g_ascii_strdown(gpgme_hash_algo_name(
+			    result->signatures->hash_algo), -1);
+		micalg = g_strdup_printf("pgp-%s", down_algo);
+		g_free(down_algo);
 	    } else {
 		micalg = g_strdup(gpgme_hash_algo_name(
 			    result->signatures->hash_algo));
diff --git a/src/prefs_common.c b/src/prefs_common.c
@@ -221,6 +221,8 @@ static PrefParam param[] = {
 	 &prefs_common.compose_body_format, P_STRING, NULL, NULL, NULL},
 	{"show_compose_margin", "FALSE", &prefs_common.show_compose_margin, P_BOOL,
 	 NULL, NULL, NULL},
+	{"type_any_header", "FALSE", &prefs_common.type_any_header, P_BOOL,
+	 NULL, NULL, NULL},
 	
 
 	{"linewrap_length", "72", &prefs_common.linewrap_len, P_INT,
diff --git a/src/prefs_common.h b/src/prefs_common.h
@@ -167,6 +167,7 @@ struct _PrefsCommon
 	gchar *compose_subject_format;
 	gchar *compose_body_format;
 	gboolean show_compose_margin;
+	gboolean type_any_header;
 
 	/* Quote */
 	gboolean reply_with_quote;