sync with 0.8.5cvs20
authorPaul Mangan <paul@claws-mail.org>
Thu, 7 Nov 2002 08:28:17 +0000 (08:28 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 7 Nov 2002 08:28:17 +0000 (08:28 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/messageview.c
src/prefs_account.c
src/prefs_account.h
src/prefs_actions.c
src/procmime.c
src/procmime.h

index 8f7809d5b66b275f2e058c6990a86951ff8faf31..d08dace16c8ff00e1d89ecdb77a98fbf5ca353b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-07
+
+       * src/prefs_account.[ch]: removed prefs_account_save_config() since
+         it is not used.
+       * src/procmime.[ch]: removed procmime_mimeinfo_free() since
+         procmime_mimeinfo_free_all() can be used in every case.
+
 2002-11-06
 
        * src/account.c: account_get_special_folder(): support F_INBOX, and
index 4234e0e5f1bea613acef3baf40e9c1b8b6cfed09..a1c3128434693f9bd580c97928aa2d630be260db 100644 (file)
@@ -1,3 +1,8 @@
+2002-11-07 [paul]      0.8.5claws85
+
+       * sync with 0.8.5cvs20
+               see ChangeLog 2002-11-07
+
 2002-11-07 [colin]     0.8.5claws84
 
        * src/folder.[ch]
index d7c4bd678f6a9780ab7490d18c35c5b3705fbcfb..2e6458e3f8fc154397bc5d75ffd93e138d153545 100644 (file)
@@ -1,3 +1,10 @@
+2002-11-07
+
+       * src/prefs_account.[ch]: »È¤ï¤ì¤Æ¤¤¤Ê¤¤¤¿¤á
+         prefs_account_save_config() ¤òºï½ü¡£
+       * src/procmime.[ch]: procmime_mimeinfo_free_all() ¤¬Á´¤Æ¤Î¾ì¹ç¤Ë
+         »È¤¨¤ë¤¿¤á procmime_mimeinfo_free() ¤òºï½ü¡£
+
 2002-11-06
 
        * src/account.c: account_get_special_folder(): F_INBOX ¤ËÂбþ¤·¡¢
index f3076bfeda96684fffda4233e106598c167e2f9a..9b97e61e1cd5b4a8e499ec1180f998a49dabb6e3 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws84
+EXTRA_VERSION=claws85
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 2cd6fda1f1f6124c85a75616b72622bce26915be..18c3046538eb40c3f5c7336e99d529b1ac355b59 100644 (file)
@@ -446,7 +446,7 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo,
        file = procmsg_get_message_file_path(msginfo);
        if (!file) {
                g_warning(_("can't get message file path.\n"));
-               procmime_mimeinfo_free(mimeinfo);
+               procmime_mimeinfo_free_all(mimeinfo);
                return;
        }
 
@@ -465,7 +465,7 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo,
        } else {
                messageview_change_view_type(messageview, MVIEW_TEXT);
                textview_show_message(messageview->textview, mimeinfo, file);
-               procmime_mimeinfo_free(mimeinfo);
+               procmime_mimeinfo_free_all(mimeinfo);
        }
 
        if (MSG_IS_RETRCPT_PENDING(msginfo->flags))
index 543ab362fc9d15986ae8e869887ae092b3e2abae..f8ba0d35eb6370def44e6426c16238b21c364f9f 100644 (file)
@@ -565,17 +565,6 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
        prefs_custom_header_read_config(ac_prefs);
 }
 
-void prefs_account_save_config(PrefsAccount *ac_prefs)
-{
-       gchar *buf;
-
-       g_return_if_fail(ac_prefs != NULL);
-
-       tmp_ac_prefs = *ac_prefs;
-       buf = g_strdup_printf("Account: %d", ac_prefs->account_id);
-       prefs_save_config(param, buf, ACCOUNT_RC);
-}
-
 void prefs_account_save_config_all(GList *account_list)
 {
        GList *cur;
index 4eb03c2b0f052590e38ff06eab61bb50da226648..35d91361f9e5c44d692f6ddcf62eb0f0af1ba004 100644 (file)
@@ -198,7 +198,6 @@ PrefsAccount *prefs_account_new             (void);
 
 void prefs_account_read_config         (PrefsAccount   *ac_prefs,
                                         const gchar    *label);
-void prefs_account_save_config         (PrefsAccount   *ac_prefs);
 void prefs_account_save_config_all     (GList          *account_list);
 
 void prefs_account_free                        (PrefsAccount   *ac_prefs);
index 9e65f44fd0ee25e553e772499bbd077ebc9a6f74..0d60eb9e3f99d4d666d2242f8db1eb9e188afeb2 100644 (file)
@@ -686,7 +686,7 @@ static gboolean parse_append_msgpart(GString **cmd, MsgInfo *msginfo,
 #endif
                fclose(fp);
                if (!partinfo) {
-                       procmime_mimeinfo_free(partinfo);
+                       procmime_mimeinfo_free_all(partinfo);
                        alertpanel_error(_("Could not get message part."));
                        return FALSE;
                }
@@ -711,7 +711,7 @@ static gboolean parse_append_msgpart(GString **cmd, MsgInfo *msginfo,
        ret = procmime_get_part(partname, filename, partinfo); 
 
        if (!mimeview) {
-               procmime_mimeinfo_free(partinfo);
+               procmime_mimeinfo_free_all(partinfo);
                g_free(filename);
        }
 
index 7b82cf316b004dba446f79d17e047133177a8886..bb288fdd0a3803d4b8c9c228be2efe650b5ce777 100644 (file)
@@ -60,28 +60,6 @@ MimeInfo *procmime_mimeinfo_new(void)
        return mimeinfo;
 }
 
-void procmime_mimeinfo_free(MimeInfo *mimeinfo)
-{
-       if (!mimeinfo) return;
-
-       g_free(mimeinfo->encoding);
-       g_free(mimeinfo->content_type);
-       g_free(mimeinfo->charset);
-       g_free(mimeinfo->name);
-       g_free(mimeinfo->boundary);
-       g_free(mimeinfo->content_disposition);
-       g_free(mimeinfo->filename);
-#if USE_GPGME
-       g_free(mimeinfo->plaintextfile);
-       g_free(mimeinfo->sigstatus);
-       g_free(mimeinfo->sigstatus_full);
-#endif
-
-       procmime_mimeinfo_free(mimeinfo->sub);
-
-       g_free(mimeinfo);
-}
-
 void procmime_mimeinfo_free_all(MimeInfo *mimeinfo)
 {
        while (mimeinfo != NULL) {
index 2b6b51d6089a3ff26a06ddc1650d3fe3fc3fcf61..ededf13fe3c5927d0ac3804d8565cf1b234d58e8 100644 (file)
@@ -124,7 +124,6 @@ struct _MimeInfo
 /* MimeInfo handling */
 
 MimeInfo *procmime_mimeinfo_new                (void);
-void procmime_mimeinfo_free            (MimeInfo       *mimeinfo);
 void procmime_mimeinfo_free_all                (MimeInfo       *mimeinfo);
 
 MimeInfo *procmime_mimeinfo_insert     (MimeInfo       *parent,