[pkg-fso-commits] [SCM] freesmartphone.org demo GUI branch, debian, updated. debian/0-git20080809-3-7-g4d7dbb8

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 8c9b6c6c4a67f2581bdf4f8e39e73f1f7b77a996
Merge: f0d234bae050d1f5905ea987f4b2d087b8127a57 a06c5576f199e01122204ef17b30eacee6f371e9
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Aug 24 14:50:54 2008 +0200

    Merge branch 'phone-number-matching' into debian

diff --combined src/zhone
index b1042ba,630b6ae..6421b3e
--- a/src/zhone
+++ b/src/zhone
@@@ -424,9 -424,6 +424,9 @@@ class pyphone_sms(edje_group)
                  self.cbMessagebookReply( [
                      (0, "read", "+4544555", "Hello World!"),
                      (1, "read", "+456663443", "Zhone!"),
 +                    (2, "read", "+456663443", "Hi Guy\nGuess what, I now "+
 +			"know to write multi-line SMSs.\nIsn't that "+
 +			"nice?\n\nSome Buddy"),
                  ] )
  
      def onReadyStatus( self, status ):
@@@ -452,8 -449,7 +452,8 @@@
          for i in range( 0, len( self.current ) ):
              main_text = self.main.groups["contacts"].tryNumberToName( self.current[i][2] )
              self.part_text_set( "label_main_list_%i" % i, main_text )
 -            self.part_text_set( "label_sub_list_%i" % i, u"(%s) %s" % ( self.current[i][1], self.current[i][3] ) )
 +	    sub_text = " ".join(self.current[i][3].splitlines())
 +            self.part_text_set( "label_sub_list_%i" % i, u"(%s) %s" % ( self.current[i][1], sub_text ) )
          for i in range( len( self.current ), 6):
              self.part_text_set( "label_main_list_%i" % i, u"" )
              self.part_text_set( "label_sub_list_%i" % i, u"" )
@@@ -656,9 -652,25 +656,25 @@@ class pyphone_contacts(edje_group)
          self.prepare()
          self.updateList()
  
+     def comparePhoneNumber(self, number1, number2):
+         '''
+         Compares two phone numbers. They are considered equal if:
+           a) Both start with a "+", and all following digits are equal
+         or
+           b) At least one of them does not start with a "+", and the
+              last 7 digits are equal
+         '''
+         number1 = filter (lambda c: c.isdigit() or c == '+', number1)
+         number2 = filter (lambda c: c.isdigit() or c == '+', number2)
+ 
+         if number1[0] == number2[0] == '+':
+             return number1 == number2
+         else:
+             return number1[-7:] == number2[-7:]
+ 
      def tryNumberToName( self, number ):
          for i in range( len( self.phonebook ) ):
-             if self.phonebook[i][2] == number:
+             if self.comparePhoneNumber(self.phonebook[i][2], number):
                  return self.phonebook[i][1]
          return number
  

-- 
freesmartphone.org demo GUI