[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 5930ed552ea2c77f5e6da4717dac4ee8d7cae54a
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Sat Sep 26 14:31:34 2009 +0200

    opimd: GenericDomain: fix unicode problems in make_comp_value

diff --git a/framework/subsystems/opimd/docs/TODO b/framework/subsystems/opimd/docs/TODO
index ae0c990..715dd7a 100644
--- a/framework/subsystems/opimd/docs/TODO
+++ b/framework/subsystems/opimd/docs/TODO
@@ -1,4 +1,5 @@
 Near future:
+* fix sorting by timestamps (float vs. string)
 * Initialized signal in source
 In mean-time:
 * write documentation
@@ -8,6 +9,7 @@ After that:
 * finished inteligent queries (ContactDeleted, ContactUpdated)
 * updating with SIM-Messages-FSO
 * adding new fields to for example SIM entry (by merging)
+* CopyTo, MoveTo (in entries and in queries)
 Think about:
 * vcard support in SIM-Messages-FSO
 * RSS-Messages backend (handler)
diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index 7af847f..04fd0cd 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -137,10 +137,12 @@ class GenericEntry():
 
     def make_comp_value(self, field_value):
         # We only generate compare values for specific fields
-        if str(field_value).startswith('tel:'):
-            return get_compare_for_tel(field_value)
-        else:
-            return ''
+        try:
+            if isinstance(field_value, (str, dbus.String)) and field_value.startswith('tel:'):
+                return get_compare_for_tel(field_value)
+        except:
+            pass
+        return ''
 
     def import_fields(self, entry_data, backend_name):
         """Adds an array of entry data fields to this entry
@@ -741,7 +743,7 @@ class GenericDomain():
                     else:
                         raise InvalidBackend( "There is no backend which can store new field" )
             elif not field_name.startswith('_'):
-                if data[field_name]=='' or isinstance(data[field_name], list) or isinstance(data[field_name], dbus.Array):
+                if data[field_name]=='' or isinstance(data[field_name], (list, dbus.Array)):
                     field_idx = entryif._field_idx[field_name]
                     field_idx.reverse()
                     for field_nr in field_idx:

-- 
FSO frameworkd Debian packaging