[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Sebastian Krzyszkowiak]

The following commit has been merged in the debian branch:
commit 62dd3bda7eea71ccb2ffc07c2e4ac1abcf7cae5e
Merge: 554977478826a9bc4dda22a41daa09956a856f7f 31f32b3b7fd670f7d5a1de4d2194ae6eb1c5878c
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Sat Sep 26 16:33:28 2009 +0200

    Merge commit 'origin/dos/opimd-tracking' into dos/opimd-tracking

diff --combined framework/subsystems/opimd/pimb_vcard_contacts.py
index 41c7ef8,d112c28..8f372fd
--- a/framework/subsystems/opimd/pimb_vcard_contacts.py
+++ b/framework/subsystems/opimd/pimb_vcard_contacts.py
@@@ -47,9 -47,9 +47,9 @@@ _VCARD_FILE_NAME = 'vcard-contacts.vcf
  
  
  #----------------------------------------------------------------------------#
- class VCARDContactBackend(Backend):
+ class VCardContactBackend(Backend):
  #----------------------------------------------------------------------------#
-     name = 'VCARD-Contacts'
+     name = 'VCard-Contacts'
      properties = [PIMB_CAN_ADD_ENTRY, PIMB_CAN_DEL_ENTRY, PIMB_CAN_UPD_ENTRY, PIMB_CAN_UPD_ENTRY_WITH_NEW_FIELD, PIMB_NEEDS_SYNC]
  
      _domain_handlers = None           # Map of the domain handler objects we support
@@@ -57,7 -57,7 +57,7 @@@
  #----------------------------------------------------------------------------#
  
      def __init__(self):
-         super(VCARDContactBackend, self).__init__()
+         super(VCardContactBackend, self).__init__()
          self._domain_handlers = {}
          self._entry_ids = []
          
@@@ -127,27 -127,27 +127,27 @@@
          path = os.path.join(rootdir, _VCARD_FILE_NAME)
          file = open(path, 'w')
  
 -        logger.error("vcard saving entry ti files")        
 +        logger.debug("vcard saving entry ti files")        
          for entry in self._domain_handlers['Contacts'].enumerate_items(self):
              line = ""
              card = vobject.vCard()
              for field in entry:
 +                logger.debug("vcard parsing memory entry")
                  (field_name, field_data) = field
                  if isinstance(field_data, (Array, list)):
                      for value in field_data:
 -                        logger.error("vcard parsing memory entry")        
                          if (field_name == "Name"): 
                              card.add('fn').value = value
                          elif (field_name == "Phone"): 
                              card.add('tel').value = value
                          elif (field_name == "E-mail"):
                              card.add('email').value = value
 -                        logger.error("vcard done")        
                  else:
-                     if (field_name == "Name"): card.add('fn').value = value
-                     elif (field_name == "Phone"): card.add('tel').value = value
-                     elif (field_name == "E-mail"): card.add('email').value = value
+                     if (field_name == "Name"): card.add('fn').value = field_data
+                     elif (field_name == "Phone"): card.add('tel').value = field_data
+                     elif (field_name == "E-mail"): card.add('email').value = field_data
                  file.write(card.serialize())
 +                logger.debug("vcard done")
          
          file.close()
  

-- 
FSO frameworkd Debian packaging