sync with 0.5.1cvs4
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Wed, 25 Jul 2001 22:13:17 +0000 (22:13 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Wed, 25 Jul 2001 22:13:17 +0000 (22:13 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/account.c
src/account.h
src/compose.c
src/prefs_common.c
src/prefs_common.h
src/procmime.c

index 5d40510..84e3c65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-07-25
+
+       * src/account.c: account_edit_create(): modified the text of
+         default button.
+       * src/procmime.c:
+         procmime_scan_content_type(), procmime_scan_content_disposition():
+         fixed ESC code detection.
+       * src/compose.c: compose_reply(): automatically select account
+         according to the message header.
+       * src/prefs_common.[ch]: added member "reply_account_autosel".
+
 2001-07-25
 
        * src/progressdialog.c: made the CList scrollable.
index 031757d..fcd1f34 100644 (file)
@@ -1,3 +1,10 @@
+2001-07-25 [alfons]
+
+       * configure.in
+               Sylpheed 0.5.1claws2
+               
+       * sync with Sylpheed 0.5.1cvs4
+
 2001-07-25 [christoph]
 
        * src/scoring.c
index 6427c4f..293465d 100644 (file)
@@ -1,3 +1,14 @@
+2001-07-25
+
+       * src/account.c: account_edit_create(): ¥Ç¥Õ¥©¥ë¥È¥Ü¥¿¥ó¤Îʸ»úÎó
+         ¤ò½¤Àµ¡£
+       * src/procmime.c:
+         procmime_scan_content_type(), procmime_scan_content_disposition():
+         ESC ¥³¡¼¥É¸¡½Ð¤ò½¤Àµ¡£
+       * src/compose.c: compose_reply(): ¥á¥Ã¥»¡¼¥¸¥Ø¥Ã¥À¤Ë½¾¤Ã¤Æ¥¢¥«¥¦¥ó¥È
+         ¤ò¼«Æ°Åª¤ËÁªÂò¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/prefs_common.[ch]: ¥á¥ó¥Ð "reply_account_autosel" ¤òÄɲá£
+
 2001-07-25
 
        * src/progressdialog.c: CList ¤ò¥¹¥¯¥í¡¼¥ë²Äǽ¤Ë¤·¤¿¡£
index ab98460..70bc831 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=5
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws1
+EXTRA_VERSION=claws2
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index 46a81f6..cc65a45 100644 (file)
@@ -172,14 +172,14 @@ PrefsAccount *account_find_from_smtp_server(const gchar *address,
        return NULL;
 }
 
-/**
+/*
  * account_find_mail_from_address:
  * @address: Email address string.
- * 
+ *
  * Find a mail (not news) account with the specified email address.
- * 
+ *
  * Return value: The found account, or NULL if not found.
- **/
+ */
 PrefsAccount *account_find_mail_from_address(const gchar *address)
 {
        GList *cur;
@@ -187,7 +187,7 @@ PrefsAccount *account_find_mail_from_address(const gchar *address)
 
        for (cur = account_list; cur != NULL; cur = cur->next) {
                ac = (PrefsAccount *)cur->data;
-               if (ac->protocol != A_NNTP &&
+               if (!ac->protocol != A_NNTP &&
                    !strcmp2(address, ac->address))
                        return ac;
        }
@@ -481,7 +481,7 @@ static void account_edit_create(void)
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
 
-       default_btn = gtk_button_new_with_label (_(" Set as usually used account "));
+       default_btn = gtk_button_new_with_label (_(" Set as default account "));
        gtk_widget_show (default_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), default_btn, TRUE, FALSE, 0);
        gtk_signal_connect (GTK_OBJECT(default_btn), "clicked",
index 3632bc2..c4cfe94 100644 (file)
@@ -35,7 +35,7 @@ void        account_save_config_all   (void);
 
 PrefsAccount *account_find_from_smtp_server    (const gchar    *address,
                                                 const gchar    *smtp_server);
-PrefsAccount *account_find_mail_from_address   (const gchar    *address);
+PrefsAccount *account_find_mail_from_address           (const gchar    *address);
 PrefsAccount *account_find_from_id             (gint            id);
 
 void         account_set_menu          (void);
index de39733..c42e0c4 100644 (file)
@@ -576,13 +576,11 @@ static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        g_return_if_fail(msginfo->folder != NULL);
 
        account = msginfo->folder->folder->account;
-       if (!account && msginfo->to && prefs_common.reply_account_autoselect) {
+       if (!account && msginfo->to && prefs_common.reply_account_autosel) {
                gchar *to;
-
-               to = g_strdup(msginfo->to);
+               Xstrdup_a(to, msginfo->to, return);
                extract_address(to);
                account = account_find_mail_from_address(to);
-               g_free(to);
        }
        if (!account) account = cur_account;
        g_return_if_fail(account != NULL);
index 8379ce6..2c58d90 100644 (file)
@@ -94,6 +94,7 @@ static struct Compose {
        GtkWidget *checkbtn_autosig;
        GtkWidget *entry_sigsep;
 
+       GtkWidget *checkbtn_reply_account_autosel;
        GtkWidget *entry_fw_quotemark;
        GtkWidget *text_fw_quotefmt;
 
@@ -103,7 +104,6 @@ static struct Compose {
        GtkWidget *checkbtn_wrapatsend;
 
        GtkWidget * checkbtn_forward_as_attachment;
-       GtkWidget * checkbtn_reply_account_autoselect;
        GtkWidget * checkbtn_smart_wrapping;
 } compose;
 
@@ -293,8 +293,8 @@ static PrefParam param[] = {
        {"forward_as_attachment", "FALSE", &prefs_common.forward_as_attachment,
         P_BOOL, &compose.checkbtn_forward_as_attachment,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"reply_account_autoselect", "TRUE", &prefs_common.reply_account_autoselect,
-        P_BOOL, &compose.checkbtn_reply_account_autoselect,
+       {"reply_account_autoselect", "TRUE", &prefs_common.reply_account_autosel,
+        P_BOOL, &compose.checkbtn_reply_account_autosel,
         prefs_set_data_from_toggle, prefs_set_toggle},
         {"smart_wrapping", "TRUE", &prefs_common.smart_wrapping,
         P_BOOL, &compose.checkbtn_smart_wrapping,
@@ -1072,7 +1072,7 @@ static void prefs_compose_create(void)
        GtkWidget *checkbtn_wrapatsend;
 
        GtkWidget *checkbtn_forward_as_attachment;
-       GtkWidget *checkbtn_reply_account_autoselect;
+       GtkWidget *checkbtn_reply_account_autosel;
        GtkWidget *checkbtn_smart_wrapping;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -1202,7 +1202,7 @@ static void prefs_compose_create(void)
        PACK_CHECK_BUTTON (vbox1, checkbtn_forward_as_attachment,
                           _("Forward as attachment"));
 
-       PACK_CHECK_BUTTON (vbox1, checkbtn_reply_account_autoselect,
+       PACK_CHECK_BUTTON (vbox1, checkbtn_reply_account_autosel,
                           _("Automatically select account for mail replies"));
 
        PACK_CHECK_BUTTON (vbox1, checkbtn_smart_wrapping,
@@ -1216,6 +1216,8 @@ static void prefs_compose_create(void)
        compose.checkbtn_autosig = checkbtn_autosig;
        compose.entry_sigsep     = entry_sigsep;
 
+       compose.checkbtn_reply_account_autosel = checkbtn_reply_account_autosel;
+
        compose.spinbtn_linewrap     = spinbtn_linewrap;
        compose.spinbtn_linewrap_adj = spinbtn_linewrap_adj;
        compose.checkbtn_wrapquote   = checkbtn_wrapquote;
@@ -1223,8 +1225,6 @@ static void prefs_compose_create(void)
 
        compose.checkbtn_forward_as_attachment =
                checkbtn_forward_as_attachment;
-       compose.checkbtn_reply_account_autoselect =
-               checkbtn_reply_account_autoselect;
        compose.checkbtn_smart_wrapping = 
                checkbtn_smart_wrapping;
 }
index 9db1042..68a9ac4 100644 (file)
@@ -69,11 +69,11 @@ struct _PrefsCommon
        gint linewrap_len;
        gboolean linewrap_quote;
        gboolean linewrap_at_send;
+       gboolean reply_account_autosel;
        gboolean show_ruler;
        gchar *fw_quotemark;
        gchar *fw_quotefmt;
        gboolean forward_as_attachment;
-       gboolean reply_account_autoselect;
        gboolean smart_wrapping;
 
        /* Display */
index 7c9da47..89bca6b 100644 (file)
@@ -301,7 +301,7 @@ void procmime_scan_content_type(MimeInfo *mimeinfo, const gchar *content_type)
        gchar *buf;
 
        if (conv_get_current_charset() == C_EUC_JP &&
-           strchr(content_type, '\007')) {
+           strchr(content_type, '\033')) {
                gint len;
                len = strlen(content_type) * 2 + 1;
                Xalloca(buf, len, return);
@@ -396,7 +396,7 @@ void procmime_scan_content_disposition(MimeInfo *mimeinfo,
        gchar *buf;
 
        if (conv_get_current_charset() == C_EUC_JP &&
-           strchr(content_disposition, '\007')) {
+           strchr(content_disposition, '\033')) {
                gint len;
                len = strlen(content_disposition) * 2 + 1;
                Xalloca(buf, len, return);