Changeset 3301

Timestamp:

01/27/08 18:09:53

Author:

pvanhoof

Message:

2008-01-27 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Various code improvements
        
      • Merged camel-lite with upstream camel revision 8428
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-filter-driver.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-filter-search.c (modified) (7 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.h (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-gpg-context.c (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-mime-utils.c (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-net-utils.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-private.h (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-session.c (modified) (5 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-session.h (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap4/camel-imap4-store.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imapp/camel-imapp-store.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/nntp/camel-nntp-auth.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/nntp/camel-nntp-store.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.c (modified) (2 diffs)

trunk/ChangeLog

@@ -2 +2 @@
-
-        * Various code improvements 
+        * Merged camel-lite with upstream camel revision 8428
-
-2008-01-26  Philip Van Hoof <pvanhoof@gnome.org>

trunk/libtinymail-camel/camel-lite/ChangeLog

@@ -2 +2 @@
-this version, and the other way around). Changes to camel-lite that are
-related to Tinymail go into ../../ChangeLog
+
+2008-01-27  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Merged with Camel upstream rev. 8428
-
-2008-01-12  Philip Van Hoof <pvanhoof@gnome.org>

trunk/libtinymail-camel/camel-lite/camel/camel-filter-driver.c

@@ -32 +32 @@
-#include <time.h>
-
+#include <glib.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
+
-#ifndef G_OS_WIN32
-#include <sys/wait.h>
-#endif
-
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <glib/gi18n-lib.h>
-
-#include <libedataserver/e-sexp.h>

trunk/libtinymail-camel/camel-lite/camel/camel-filter-search.c

@@ -39 +39 @@
-#include <unistd.h>
-
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+
-#ifndef G_OS_WIN32
-#include <sys/wait.h>
-#endif
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include <libedataserver/e-iconv.h>
@@ -59 +59 @@
-#include "camel-stream-fs.h"
-#include "camel-stream-mem.h"
+#include "camel-string-utils.h"
-#include "camel-url.h"
-
@@ -94 +95 @@
-static ESExpResult *get_size (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *pipe_message (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
+
+#ifdef NON_TINYMAIL_FEATURES
-static ESExpResult *junk_test (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
+#endif
-
-/* builtin functions */
@@ -123 +127 @@
-        { "get-size",           (ESExpFunc *) get_size,           0 },
-        { "pipe-message",       (ESExpFunc *) pipe_message,       0 },
+#ifdef NON_TINYMAIL_FEATURES
-        { "junk-test",          (ESExpFunc *) junk_test,          0 },
+#endif
-};
-
@@ -645 +651 @@
-}
-
+#ifdef NON_TINYMAIL_FEATURES
-static ESExpResult *
-junk_test (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
@@ -650 +657 @@
-        ESExpResult *r;
-        gboolean retval = FALSE;
-
+
+
-        if (fms->session->junk_plugin != NULL) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                if (camel_debug ("junk"))
@@ -663 +696 @@
-        return r;
-}
+#endif
-
-/**

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

@@ -2572 +2572 @@
-                camel_flag_list_free(&mi->user_flags);
-                camel_tag_list_free(&mi->user_tags);
+                if (mi->headers)
+                        camel_header_param_list_free (mi->headers);
-#endif
-

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

@@ -161 +161 @@
-        /* tree of content description - NULL if it is not available */
-        CamelMessageContentInfo *content;  /* 4 bytes */
+#ifdef NON_TINYMAIL_FEATURES
+        struct _camel_header_param *headers;
+#endif
-        CamelSummaryMessageID message_id;  /* 8 bytes */
-

trunk/libtinymail-camel/camel-lite/camel/camel-gpg-context.c

@@ -43 +43 @@
-#include <sys/types.h>
-
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
+
-#ifndef G_OS_WIN32
-#include <sys/ioctl.h>
@@ -49 +53 @@
-#include <termios.h>
-#endif
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <glib/gstdio.h>
-
-#include <libedataserver/e-iconv.h>
@@ -824 +824 @@
-
-                if (!strncmp ((char *) status, "passphrase.pin.ask", 18)) {
-
-
+
+
+
-                } else if (!strncmp ((char *) status, "passphrase.enter", 16)) {
-
-
+
+
+
-                } else {
-                        next_token ((char *) status, &prompt);

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

@@ -1395 +1395 @@
-
-        while (inlen) {
-
+s
-                int i;
-
@@ -1426 +1426 @@
-                                        convlen += 3;
-                        }
+                        
-                        if (proclen >= 0 && proclen < i && convlen < (75 - strlen("=?utf-8?q?\?=")))
-                                proclen = i;
+                        
-                        /* well, we probably have broken utf8, just copy it anyway what the heck */
-                        if (proclen == -1) {
@@ -1433 +1435 @@
-                                proclen = inlen;
-                        }
+                        
-                        memcpy(out, inptr, proclen);
-                        inptr += proclen;

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

@@ -30 +30 @@
-#include <stdio.h>
-
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+
-#ifndef G_OS_WIN32
-#include <sys/poll.h>
@@ -35 +38 @@
-
-#include <string.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include <libedataserver/e-msgport.h>

trunk/libtinymail-camel/camel-lite/camel/camel-private.h

@@ -100 +100 @@
-
-        GHashTable *thread_msg_op;
+        GHashTable *junk_headers;
+        
-};
-

trunk/libtinymail-camel/camel-lite/camel/camel-session.c

@@ -80 +80 @@
-        session->priv->thread_active = g_hash_table_new(NULL, NULL);
-        session->priv->thread_pool = NULL;
+        session->priv->junk_headers = NULL;
-}
-
@@ -100 +101 @@
-        g_mutex_free(session->priv->lock);
-        g_mutex_free(session->priv->thread_lock);
-
+
+
+
+
-        g_free(session->priv);
-}
@@ -433 +437 @@
-}
-
+gboolean
+camel_session_lookup_addressbook (CamelSession *session, const char *name)
+{
+        g_return_val_if_fail (CAMEL_IS_SESSION (session), FALSE);
+        g_return_val_if_fail (name != NULL, FALSE);
+        return CS_CLASS (session)->lookup_addressbook (session, name);
+}
+
-/**
- * camel_session_alert_user_with_id:
@@ -472 +484 @@
-}
-
+/**
+ * camel_session_build_password_prompt:
+ * @type: account type (e.g. "IMAP")
+ * @user: user name for the account
+ * @host: host name for the account
+ *
+ * Constructs a localized password prompt from @type, @user and @host,
+ * suitable for passing to camel_session_get_password().  The resulting
+ * string contains markup tags.  Use g_free() to free it.
+ *
+ * Returns: a newly-allocated password prompt string
+ **/
+char *
+camel_session_build_password_prompt (const char *type,
+                                     const char *user,
+                                     const char *host)
+{
+        char *user_markup;
+        char *host_markup;
+        char *prompt;
+
+        g_return_val_if_fail (type != NULL, NULL);
+        g_return_val_if_fail (user != NULL, NULL);
+        g_return_val_if_fail (host != NULL, NULL);
+
+        /* Add bold tags to the "user" and "host" strings.  We use
+         * separate strings here to avoid putting markup tags in the
+         * translatable string below. */
+        user_markup = g_markup_printf_escaped ("<b>%s</b>", user);
+        host_markup = g_markup_printf_escaped ("<b>%s</b>", host);
+
+        /* Translators: The first argument is the account type
+         * (e.g. "IMAP"), the second is the user name, and the
+         * third is the host name. */
+        prompt = g_strdup_printf (
+                _("Please enter the %s password for %s on host %s."),
+                type, user_markup, host_markup);
+
+        g_free (user_markup);
+        g_free (host_markup);
+
+        return prompt;
+}
-
-/**
@@ -747 +802 @@
-        session->network_state = network_state;
-}
+
+void
+camel_session_set_junk_headers (CamelSession *session, const char **headers, const char **values, int len)
+{
+        int i;
+
+        if (session->priv->junk_headers) {
+                g_hash_table_remove_all (session->priv->junk_headers);
+                g_hash_table_destroy (session->priv->junk_headers);
+        }
+
+        session->priv->junk_headers = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+
+        for (i=0; i<len; i++) {
+                g_hash_table_insert (session->priv->junk_headers, g_strdup (headers[i]), g_strdup(values[i]));
+        }
+}
+
+const GHashTable *
+camel_session_get_junk_headers (CamelSession *session)
+{
+        return session->priv->junk_headers;
+}

trunk/libtinymail-camel/camel-lite/camel/camel-session.h

@@ -110 +110 @@
-        void (*thread_wait)(CamelSession *session, int id);
-        void (*thread_status)(CamelSession *session, CamelSessionThreadMsg *msg, const char *text, int pc);
+        gboolean (*lookup_addressbook) (CamelSession *session, const char *name);
-} CamelSessionClass;
-
@@ -169 +170 @@
-                                                     CamelService *service);
-
+char *             camel_session_build_password_prompt
+                                                    (const char *type,
+                                                     const char *user,
+                                                     const char *host);
+
-gboolean           camel_session_is_online          (CamelSession *session);
-void               camel_session_set_online         (CamelSession *session,
@@ -206 +212 @@
-gboolean camel_session_get_network_state (CamelSession *session);
-void camel_session_set_network_state (CamelSession *session, gboolean network_state);
+const GHashTable * camel_session_get_junk_headers (CamelSession *session);
+void camel_session_set_junk_headers (CamelSession *session, const char **headers, const char **values, int len);
+gboolean camel_session_lookup_addressbook (CamelSession *session, const char *name);
-
-G_END_DECLS

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c

@@ -2166 +2166 @@
-        }
-
-
-
+
+
+
+
- lose:
-        g_warning ("Bad COPYUID response from server");
@@ -3046 +3048 @@
-
-        return;
+}
+
+#endif
+
+
+#ifdef NON_TINYMAIL_FEATURES
+
+struct _junk_data {
+        GData *data;
+        CamelMessageInfoBase *mi;
+};
+
+static void
+construct_junk_headers (char *header, char *value, struct _junk_data *jdata)
+{
+        char *bs, *es, *flag=NULL;
+        char *bdata = g_datalist_get_data (&(jdata->data), "BODY_PART_DATA");
+        struct _camel_header_param *node;
+
+        /* FIXME: This can be written in a much clever way.
+        * We can create HEADERS file or carry all headers till filtering so
+        * that header based filtering can be much faster. But all that later. */
+        bs = camel_strstrcase (bdata ? bdata:"", header);
+        if (bs) {
+                bs += strlen(header);
+                bs = strchr (bs, ':');
+                if (bs) {
+                        bs++;
+                        while (*bs == ' ')
+                                bs++;
+                        es = strchr (bs, '\n');
+                        if (es)
+                                flag = g_strndup (bs, es-bs);
+                        else
+                                bs = NULL;
+                }
+
+        }
+
+
+        if (bs) {
+                node = g_new (struct _camel_header_param, 1);
+                node->name = g_strdup (header);
+                node->value = flag;
+                node->next = jdata->mi->headers;
+                jdata->mi->headers = node;
+        }
-}
-

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c

@@ -1717 +1717 @@
-
-                if (!service->url->passwd) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        g_free (errbuf);
-                        errbuf = NULL;
@@ -1784 +1789 @@
-                                return FALSE;
-
-
+
+
-                                "to IMAP server.\n%s\n\n"),
-                                camel_exception_get_description (ex));

trunk/libtinymail-camel/camel-lite/camel/providers/imap4/camel-imap4-store.c

@@ -453 +453 @@
-        if ((!mech || (mech && mech->need_password)) && !service->url->passwd) {
-                guint32 flags = CAMEL_SESSION_PASSWORD_SECRET;
-
+
+
-
-                if (reprompt)
-                        flags |= CAMEL_SESSION_PASSWORD_REPROMPT;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                if (!service->url->passwd)
@@ -534 +541 @@
-                while (imap4_try_authenticate (engine, reprompt, errmsg, &lex)) {
-                        g_free (errmsg);
-strdup (lex.desc
+markup_escape_text (lex.desc, -1
-                        camel_exception_clear (&lex);
-                        g_free (service->url->passwd);

trunk/libtinymail-camel/camel-lite/camel/providers/imapp/camel-imapp-store.c

@@ -358 +358 @@
-{
-        if (((CamelService *)store)->url->passwd == NULL) {
-
+
+
-                CamelException ex;
-
-                camel_exception_init(&ex);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (camel_exception_is_set(&ex))
-                        camel_exception_throw_ex(&ex);
@@ -439 +448 @@
-                                switch (e->id) {
-                                case CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE:
-strdup_printf
+markup_printf_escaped
-                                        camel_session_forget_password(service->session, service, NULL, "password", ex);
-                                        camel_url_set_passwd(service->url, NULL);

trunk/libtinymail-camel/camel-lite/camel/providers/nntp/camel-nntp-auth.c

@@ -44 +44 @@
-                gchar *prompt;
-
-
-
-
-
-
+
+
+
+
+
+
-                g_free (prompt);
-

trunk/libtinymail-camel/camel-lite/camel/providers/nntp/camel-nntp-store.c

@@ -1160 +1160 @@
-                char *prompt, *base;
-        retry:
-
-
-
+
+
-                if (line) {
-
+
+
-
-                        prompt = g_strdup_printf("%s\n\n%s", top, base);

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c

@@ -729 +729 @@
-
-        if (!service->url->passwd) {
-
+
+
-                guint32 flags = CAMEL_SESSION_PASSWORD_SECRET;
-
@@ -735 +736 @@
-                        flags |= CAMEL_SESSION_PASSWORD_REPROMPT;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (!service->url->passwd)
-                        return FALSE;
@@ -890 +898 @@
-                /* we only re-prompt if we failed to authenticate, any other error and we just abort */
-                if (status == 0 && camel_exception_get_id (ex) == CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE) {
-strdup_printf
+markup_printf_escaped
-                        g_free (service->url->passwd);
-                        service->url->passwd = NULL;

trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.c

@@ -549 +549 @@
-
-                        if (!service->url->passwd) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                g_free (errbuf);
-                                errbuf = NULL;
@@ -570 +577 @@
-                        authenticated = smtp_auth (transport, authtype->authproto, ex);
-                        if (!authenticated) {
-
-
-
+
+
+
+
-                                camel_exception_clear (ex);
-                        }