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 8f7809d..d08dace 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 4234e0e..a1c3128 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 d7c4bd6..2e6458e 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 f3076bf..9b97e61 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 2cd6fda..18c3046 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 543ab36..f8ba0d3 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 4eb03c2..35d9136 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 9e65f44..0d60eb9 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 7b82cf3..bb288fd 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 2b6b51d..ededf13 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,