making pickled caches block no execution

[theonering] / src / gvoice / conversations.py

diff --git a/src/gvoice/conversations.py b/src/gvoice/conversations.py
index 58b3c03..64dafb8 100644 (file)
--- a/src/gvoice/conversations.py
+++ b/src/gvoice/conversations.py
@@ -48,7 +48,7 @@ class Conversations(object):
                try:
                        with open(path, "rb") as f:
                                fileVersion, fileBuild, convs = pickle.load(f)
-               except (pickle.PickleError, IOError, EOFError, ValueError):
+               except (pickle.PickleError, IOError, EOFError, ValueError, Exception):
                        _moduleLogger.exception("While loading for %s" % self._name)
                        return
 
@@ -184,10 +184,11 @@ class MergedConversations(object):
                # * We cache to disk the history of messages sent/received
                # * On first run we mark all server messages as read due to no cache
                # * If not first load or from cache (disk or in-memory) then it must be unread
-               if markAllAsRead:
-                       newConversation.isRead = True
-               else:
-                       newConversation.isRead = False
+               if newConversation.type != newConversation.TYPE_VOICEMAIL:
+                       if markAllAsRead:
+                               newConversation.isRead = True
+                       else:
+                               newConversation.isRead = False
 
                if newConversation.messages:
                        # must not have had all items removed due to duplicates