Changeset 2830

Timestamp:

10/11/07 11:40:24

Author:

pvanhoof

Message:

2007-10-11 Philip Van Hoof <pvanhoof@gnome.org>

• • • • iconv error situation handler
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-mime-utils.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-10-11  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * iconv error situation handler
+
-2007-10-10  Jose Dapena Paz  <jdapena@igalia.com>
-

trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c

@@ -2044 +2044 @@
-        
-        charset = charset ? e_iconv_charset_name (charset) : NULL;
-
+
-        subject = summary_format_string(h, "subject", charset);
-        from = summary_format_address(h, "from", charset);

trunk/libtinymail-camel/camel-lite/camel/camel-mime-utils.c

@@ -905 +905 @@
-                                        *outbuf = 0;
-                                        decoded = g_strdup (outbase);
+                                } else {
+                                        perror ("iconv");
+                                        e_iconv (ic, NULL, 0, &outbuf, &outlen);
+                                        *outbuf = 0;
+                                        decoded = g_strdup (outbase);
+                                        /* decoded = g_strdup (inbuf); */
-                                }
+
-                                e_iconv_close (ic);
-                        } else {