Mercurial > libpst

diff src/pst2dii.cpp.in @ 79:56fa05fd5271

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Patch from Robert Simpson for encryption type 2. Fix the order of testing item types to avoid claiming there are multiple message stores.
author Carl Byington <carl@five-ten-sg.com>
date Fri, 13 Jun 2008 20:47:01 -0700
parents 3cb02cb1e6cd
children 7133b39975f7
line wrap: on
line diff
--- a/src/pst2dii.cpp.in	Tue Jun 10 14:28:55 2008 -0700
+++ b/src/pst2dii.cpp.in	Fri Jun 13 20:47:01 2008 -0700
@@ -620,11 +620,6 @@
             item = pst_parse_item(&pstfile, d_ptr);
             DEBUG_INFO(("item pointer is %p\n", item));
             if (item) {
-                if (item->message_store) {
-                    // there should only be one message_store, and we have already done it
-                    DIE(("main: A second message_store has been found. Sorry, this must be an error.\n"));
-                }
-
                 if (item->folder && d_ptr->child )  {
                     //if this is a non-empty folder, we want to recurse into it
                     fprintf(stderr, "entering folder %s\n", item->file_as);
@@ -636,7 +631,7 @@
                         DEBUG_MAIN(("main: I have an email, but the folder isn't an email folder. Processing anyway\n"));
                     }
                     write_normal_email(ff, item, &pstfile);
-                                }
+                }
                 pst_freeItem(item);
             } else {
                 ff.skip_count++;