Changeset 1944

Timestamp:

05/13/07 13:20:21

Author:

pvanhoof

Message:

Merging with camel's upstream

Files:

• trunk/libtinymail-camel/camel-lite/camel/camel-data-cache.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-mime-filter-tohtml.c (modified) (1 diff)

trunk/libtinymail-camel/camel-lite/camel/camel-data-cache.c

@@ -133 +133 @@
-        CamelDataCache *cdc;
-
-e_util_mkdir_hier
+g_mkdir_with_parents
-                camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-                                     _("Unable to create cache path"));
@@ -327 +327 @@
-#endif
-                if (create)
-e_util_mkdir_hier
+g_mkdir_with_parents
-        } else if (cdc->priv->expire_inc == hash
-                   && (cdc->expire_age != -1 || cdc->expire_access != -1)) {

trunk/libtinymail-camel/camel-lite/camel/camel-mime-filter-tohtml.c

@@ -61 +61 @@
-        { CONVERT_WEB_URLS, { "telnet://", "",        camel_url_web_start,      camel_url_web_end      } },
-        { CONVERT_WEB_URLS, { "webcal://", "",        camel_url_web_start,      camel_url_web_end      } },
-
-
+
+
+
+
-        { CONVERT_WEB_URLS, { "www.",      "http://", camel_url_web_start,      camel_url_web_end      } },
-        { CONVERT_WEB_URLS, { "ftp.",      "ftp://",  camel_url_web_start,      camel_url_web_end      } },