Make Message-ID string generation less confusing.

[claws.git] / src / messageview.c

diff --git a/src/messageview.c b/src/messageview.c
index fc69035605c6295608bcb2270098792f13c30d2e..d2373161c1c3992a405dd49fd096cc468deb4e58 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -976,26 +976,13 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                goto FILE_ERROR;
 
        /* Message ID */
-       if (account->set_domain && account->domain) {
-               g_snprintf(buf, sizeof(buf), "%s", account->domain); 
-       } else if (!strncmp(get_domain_name(), "localhost", strlen("localhost"))) {
-               g_snprintf(buf, sizeof(buf), "%s", 
-                       strchr(account->address, '@') ?
-                               strchr(account->address, '@')+1 :
-                               account->address);
-       } else {
-               g_snprintf(buf, sizeof(buf), "%s", "");
-       }
-       
        if (account->gen_msgid) {
-               gchar *addr = NULL;
-               if (account->msgid_with_addr) {
-                       addr = account->address;
-               }
-               generate_msgid(buf, sizeof(buf), addr);
-
-               if (fprintf(fp, "Message-ID: <%s>\n", buf) < 0)
+               gchar *addr = prefs_account_generate_msgid(account);
+               if (fprintf(fp, "Message-ID: <%s>\n", addr) < 0) {
+                       g_free(addr);
                        goto FILE_ERROR;
+               }
+               g_free(addr);
        }
 
        boundary = generate_mime_boundary("DN");
@@ -1300,7 +1287,10 @@ static void messageview_find_part_depth_first(MimeInfoSearch *context, MimeMedia
 
        debug_print("found part %d/%s\n", mimeinfo->type, mimeinfo->subtype);
 
-       if (mimeinfo->type == MIMETYPE_MULTIPART) {
+       if (mimeinfo->type == type
+                       && !strcasecmp(mimeinfo->subtype, subtype)) {
+               context->found = mimeinfo;
+       } else if (mimeinfo->type == MIMETYPE_MULTIPART) {
                if (!strcasecmp(mimeinfo->subtype, "alternative")
                                || !strcasecmp(mimeinfo->subtype, "related")) {
                        context->found = procmime_mimeinfo_next(mimeinfo);
@@ -2639,9 +2629,7 @@ static void goto_unread_folder_cb(GtkAction *action, gpointer data)
 static void goto_folder_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
-       messageview->updating = TRUE;
        FolderItem *to_folder;
-       messageview->updating = FALSE;
 
        to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL, FALSE);