save-all fixes
authorThorsten Maerz <torte@netztorte.de>
Sat, 22 Feb 2003 11:47:14 +0000 (11:47 +0000)
committerThorsten Maerz <torte@netztorte.de>
Sat, 22 Feb 2003 11:47:14 +0000 (11:47 +0000)
ChangeLog.claws
configure.ac
src/mimeview.c

index d699dc8..ef1202d 100644 (file)
@@ -1,3 +1,9 @@
+2003-02-22 [thorsten]  0.8.10claws41
+
+       * src/mimeview.c
+               save-all fixes: crash if invoked on multipart container,
+               mimeinfo access, pathseparators, error dialog
+
 2003-02-21 [alfons]    0.8.10claws40
 
        * src/prefs_gtk.c
index 60674b7..720ff2c 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws40
+EXTRA_VERSION=claws41
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 8bf07a9..fd37a52 100644 (file)
@@ -810,24 +810,25 @@ static void mimeview_save_all(MimeView *mimeview)
        if (!dirname) return;
 
        /* return to first children */
+       if (!partinfo->parent->children) return;  /* multipart container? */
        attachment = partinfo->parent->children->next;
        /* for each attachment, extract it in the selected dir. */
        while (attachment != NULL) {
                static guint subst_cnt = 1;
                gchar *attachdir;
-               gchar *attachname = (attachment->filename)
-                       ? g_strdup(attachment->filename)
-                       : g_strdup_printf("noname.%d",subst_cnt++);
-               AlertValue aval;
+               gchar *attachname = g_strdup(get_part_name(attachment));
+               AlertValue aval = G_ALERTDEFAULT;
                gchar *res;
 
-               subst_chars(attachname, "/\\", G_DIR_SEPARATOR);
+               if (!attachname || !strlen(attachname))
+                       attachname = g_strdup_printf("noname.%d",subst_cnt++);
                subst_chars(attachname, ":?*&|<>\t\r\n", '_');
                g_snprintf(buf, sizeof(buf), "%s%s",
                           dirname,
                           (attachname[0] == G_DIR_SEPARATOR)
                           ? &attachname[1]
                           : attachname);
+               subst_chars(buf, "/\\", G_DIR_SEPARATOR);
                attachdir = g_dirname(buf);
                make_dir_hier(attachdir);
                g_free(attachdir);
@@ -841,7 +842,7 @@ static void mimeview_save_all(MimeView *mimeview)
                }
                g_free(attachname);
 
-               if (G_ALERTDEFAULT == aval && procmime_get_part(buf, mimeview->file, attachment) < 0)
+               if ((G_ALERTDEFAULT != aval) || (procmime_get_part(buf, mimeview->file, attachment) < 0))
                        alertpanel_error(_("Can't save the part of multipart message."));
                attachment = attachment->next;
        }