sync with 0.8.6cvs3
authorPaul Mangan <paul@claws-mail.org>
Mon, 25 Nov 2002 18:09:26 +0000 (18:09 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 25 Nov 2002 18:09:26 +0000 (18:09 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/gtkutils.c
src/send.c
src/session.h
src/smtp.c
src/smtp.h

index 1252805..12fc019 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2002-11-18
+
+       * src/smtp.[ch]: separated smtp_auth() from smtp_from().
+       * src/send.c: send_message_smtp(): call smtp_auth() and display
+         the state to the dialog.
+
+2002-11-18
+
+       * src/filter.c: strmatch_regex(): use extended regex (thanks to
+         Fabien Devaux).
+       * src/main.c: main(): removed the code for assortrc -> filterrc
+         transition.
+       * src/gtkutils.c: gtkut_font_load(): only use gdk_font_load() if
+         current locale is C or POSIX.
+         gtkut_stext_is_uri_string(): include "www." for URI string.
+       * src/textview.c: textview_make_clickable_parts(): include "www."
+         for URI string.
+
+2002-11-15
+
+       * version 0.8.6
+
 2002-11-13
 
        * src/textview.c: textview_add_part(): indicate signature status
index 92aa5a6..aca2477 100644 (file)
@@ -1,3 +1,8 @@
+2002-11-25 [paul]      0.8.6claws6
+
+       * sync with 0.8.6cvs3
+               see ChangeLog 2002-11-18
+
 2002-11-25 [colin]     0.8.6claws5
 
        * src/gtkutils.[ch]
index cadb3dc..b53621f 100644 (file)
@@ -1,3 +1,25 @@
+2002-11-18
+
+       * src/smtp.[ch]: smtp_from() ¤«¤é smtp_auth() ¤òʬΥ¡£
+       * src/send.c: send_message_smtp(): smtp_auth() ¤ò¸Æ¤Ó½Ð¤·¡¢¤½¤Î¾õÂÖ
+         ¤ò¥À¥¤¥¢¥í¥°¤Ëɽ¼¨¡£
+
+2002-11-18
+
+       * src/filter.c: strmatch_regex(): ³ÈÄ¥Àµµ¬É½¸½¤ò»ÈÍÑ(Fabien Devaux
+         ¤µ¤ó thanks)¡£
+       * src/main.c: main(): assortrc -> filterrc °Ü¹Ô¤Î¤¿¤á¤Î¥³¡¼¥É¤ò
+         ºï½ü¡£
+       * src/gtkutils.c: gtkut_font_load(): ¸½ºß¤Î locale ¤¬ C ¤Þ¤¿¤Ï
+         POSIX ¤Î¾ì¹ç¤Î¤ß gdk_font_load() ¤ò»ÈÍÑ¡£
+         gtkut_stext_is_uri_string(): URI Ê¸»úÎó¤Ë "www." ¤ò´Þ¤à¤è¤¦¤Ë¤·¤¿¡£
+       * src/textview.c: textview_make_clickable_parts(): URI Ê¸»úÎó¤Ë
+         "www." ¤ò´Þ¤à¤è¤¦¤Ë¤·¤¿¡£
+
+2002-11-15
+
+       * version 0.8.6
+
 2002-11-13
 
        * src/textview.c: textview_add_part(): ½ð̾¤Î¾õÂÖ¤ò°Û¤Ê¤ë¿§¤Çɽ¼¨¡£
index a33c709..889b036 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws5
+EXTRA_VERSION=claws6
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 0e6c084..168f9f7 100644 (file)
@@ -86,7 +86,7 @@ GdkFont *gtkut_font_load(const gchar *fontset_name)
 
        g_return_val_if_fail(fontset_name != NULL, NULL);
 
-       if (MB_CUR_MAX == 1)
+       if (conv_get_current_charset() == C_US_ASCII)
                font = gtkut_font_load_from_fontset(fontset_name);
        else
                font = gdk_fontset_load(fontset_name);
@@ -432,9 +432,9 @@ guint gtkut_stext_str_compare(GtkSText *text, guint start_pos, guint text_len,
 gboolean gtkut_stext_is_uri_string(GtkSText *text,
                                   guint start_pos, guint text_len)
 {
-       if (gtkut_stext_str_compare(text, start_pos, text_len, "http://") ||
-           gtkut_stext_str_compare(text, start_pos, text_len, "ftp://")  ||
-           gtkut_stext_str_compare(text, start_pos, text_len, "https://")||
+       if (gtkut_stext_str_compare(text, start_pos, text_len, "http://")  ||
+           gtkut_stext_str_compare(text, start_pos, text_len, "ftp://")   ||
+           gtkut_stext_str_compare(text, start_pos, text_len, "https://") ||
            gtkut_stext_str_compare(text, start_pos, text_len, "www."))
                return TRUE;
 
index 0772ded..d33bd30 100644 (file)
@@ -415,14 +415,24 @@ gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list,
                           "connecting to server");
 #endif
 
+       if (user) {
+               progress_dialog_set_label(dialog->dialog,
+                                         _("Authenticating..."));
+               gtk_clist_set_text(clist, 0, 2, _("Authenticating"));
+               GTK_EVENTS_FLUSH();
+
+               SEND_EXIT_IF_NOTOK(smtp_auth(SMTP_SESSION(session),
+                                            ac_prefs->smtp_auth_type),
+                                  "authenticating");
+       }
+
        progress_dialog_set_label(dialog->dialog, _("Sending MAIL FROM..."));
        statusbar_puts_all(_("Sending MAIL FROM..."));
        gtk_clist_set_text(clist, 0, 2, _("Sending"));
        GTK_EVENTS_FLUSH();
 
        SEND_EXIT_IF_NOTOK
-               (smtp_from(SMTP_SESSION(session), ac_prefs->address,
-                          ac_prefs->smtp_auth_type),
+               (smtp_from(SMTP_SESSION(session), ac_prefs->address),
                 "sending MAIL FROM");
 
        progress_dialog_set_label(dialog->dialog, _("Sending RCPT TO..."));
index 9c88f81..b57c57d 100644 (file)
@@ -41,6 +41,9 @@ typedef enum {
        SESSION_RECV
 } SessionPhase;
 
+typedef void (*SessionUIFunc)  (gpointer        data,
+                                gint            state);
+
 struct _Session
 {
        SessionType type;
@@ -56,6 +59,8 @@ struct _Session
        gpointer data;
 
        void (*destroy)         (Session        *session);
+
+       SessionUIFunc ui_func;
 };
 
 void session_destroy   (Session        *session);
index d4066fc..9e4ffc4 100644 (file)
@@ -147,19 +147,13 @@ void smtp_session_destroy(Session *session)
        g_free(SMTP_SESSION(session)->pass);
 }
 
-gint smtp_from(SMTPSession *session, const gchar *from,
-              SMTPAuthType forced_auth_type)
+gint smtp_from(SMTPSession *session, const gchar *from)
 {
        gchar buf[MSGBUFSIZE];
 
        g_return_val_if_fail(session != NULL, SM_ERROR);
        g_return_val_if_fail(from != NULL, SM_ERROR);
 
-       if (session->user) {
-               if (smtp_auth(session, forced_auth_type) != SM_OK)
-                       return SM_AUTHFAIL;
-       }
-
        if (strchr(from, '<'))
                g_snprintf(buf, sizeof(buf), "MAIL FROM: %s", from);
        else
index 0ea9324..7a76080 100644 (file)
@@ -80,8 +80,7 @@ Session *smtp_session_new     (const gchar    *server,
 void smtp_session_destroy      (Session        *session);
 
 gint smtp_from                 (SMTPSession    *session,
-                                const gchar    *from,
-                                SMTPAuthType    forced_auth_type);
+                                const gchar    *from);
 gint smtp_auth                 (SMTPSession    *session,
                                 SMTPAuthType    forced_auth_type);