Adding a debug prompt.

[theonering] / src / gvoice / conversations.py

diff --git a/src/gvoice/conversations.py b/src/gvoice/conversations.py
index 4541608..36aca67 100644 (file)
--- a/src/gvoice/conversations.py
+++ b/src/gvoice/conversations.py
@@ -4,6 +4,7 @@
 import logging
 
 import util.coroutines as coroutines
+import util.misc as util_misc
 
 
 _moduleLogger = logging.getLogger("gvoice.conversations")
@@ -27,7 +28,7 @@ class Conversations(object):
                conversations = list(self._backend.get_conversations())
                conversations.sort()
                for conversation in conversations:
-                       key = conversation.contactId, conversation.number
+                       key = conversation.contactId, util_misc.strip_number(conversation.number)
                        try:
                                mergedConversations = self._conversations[key]
                        except KeyError:
@@ -38,7 +39,8 @@ class Conversations(object):
                                mergedConversations.append_conversation(conversation)
                                isConversationUpdated = True
                        except RuntimeError, e:
-                               _moduleLogger.info("Skipping conversation for %r because '%s'" % (key, e))
+                               if False:
+                                       _moduleLogger.info("Skipping conversation for %r because '%s'" % (key, e))
                                isConversationUpdated = False
 
                        if isConversationUpdated: