X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fgvoice%2Fconversations.py;h=6e0811205f153bcfd7adcc80c1296149c7660d56;hp=8baf8b8f91b008a84a7a264918ffb05f551226f4;hb=54fb3d0f7f39e6446e1771cc29483a4d6138f8dd;hpb=3d5f80ff4e1607d37b92566619f1c3d6180fd000

diff --git a/src/gvoice/conversations.py b/src/gvoice/conversations.py
index 8baf8b8..6e08112 100644
--- a/src/gvoice/conversations.py
+++ b/src/gvoice/conversations.py
@@ -1,10 +1,10 @@
 #!/usr/bin/python
 
-# @bug Its inconsistent as to whether messages from contacts come as from the
-# contact or just a raw number.  It seems GV is inconsistent about populating the contact id, so we might have to pull from the addressbook
 # @bug False positives on startup.  Luckily the object path for the channel is
 # unique, so can use that to cache some of the data out to file
 
+from __future__ import with_statement
+
 import logging
 
 import util.coroutines as coroutines
@@ -32,7 +32,7 @@ class Conversations(object):
 		conversations = list(self._get_raw_conversations())
 		conversations.sort()
 		for conversation in conversations:
-			key = conversation.contactId, util_misc.strip_number(conversation.number)
+			key = conversation.contactId, util_misc.normalize_number(conversation.number)
 			try:
 				mergedConversations = self._conversations[key]
 			except KeyError: