talons

commit 2d28879ba939c9afd60ec7375c3f8ba8b31b0212
parent fdce34540de35c932e715b06ce0f6853e3b6a0c5
Author: Ricardo Mones <mones@claws-mail.org>
Date:   Fri, 11 Feb 2011 10:11:17 +0000

2011-02-11 [mones]	3.7.8cvs53

	* manual/es/advanced.xml
		Sync with English manual
	* src/imap.c
		Fix remaining mismatched alloc/free from cppcheck

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
manual/es/advanced.xml
 | 
11
++++++++++-
M
src/imap.c
 | 
2
+-

5 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-11 [mones]	3.7.8cvs53
+
+	* manual/es/advanced.xml
+		Sync with English manual
+	* src/imap.c
+		Fix remaining mismatched alloc/free from cppcheck
+
 2011-02-10 [pawel]	3.7.8cvs52
 
 	* src/ldapupdate.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4126,3 +4126,4 @@
 ( cvs diff -u -r 1.105.2.163 -r 1.105.2.164 src/prefs_account.c;  ) > 3.7.8cvs50.patchset
 ( cvs diff -u -r 1.30.2.61 -r 1.30.2.62 src/prefs_toolbar.c;  ) > 3.7.8cvs51.patchset
 ( cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/ldapupdate.c;  ) > 3.7.8cvs52.patchset
+( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 manual/es/advanced.xml;  cvs diff -u -r 1.179.2.252 -r 1.179.2.253 src/imap.c;  ) > 3.7.8cvs53.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=52
+EXTRA_VERSION=53
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/manual/es/advanced.xml b/manual/es/advanced.xml
@@ -782,7 +782,7 @@
 	  </para>
 	</listitem>
       </varlistentry>
-       <varlistentry>
+      <varlistentry>
         <term><literal>show_compose_margin</literal></term>
         <listitem>
           <para>
@@ -792,6 +792,15 @@
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><literal>show_inline_attachments</literal></term>
+        <listitem>
+          <para>
+        0 o 1. Muestra los adjuntos incrustados en el cuerpo del mensaje en
+	la vista de la estructura MIME. Por omisión es 1, activado.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
 	<term><literal>skip_ssl_cert_check</literal></term>
 	<listitem>
 	  <para>
diff --git a/src/imap.c b/src/imap.c
@@ -5696,7 +5696,7 @@ char* imap_modified_utf7_to_utf8(const char *mbox, gboolean change_spaces)
   unsigned long ucs4, utf16, bitbuf;
   unsigned char base64[256];
   const char *src;
-  char *dst, *res  = malloc(2*strlen(mbox)+1);
+  char *dst, *res  = g_malloc(2*strlen(mbox)+1);
 
   bitbuf = 0;
   dst = res;