Join up GUI, by adding 'Hermes' as a wrapper around Syncjob. This will

[hermes] / package / src / org / maemo / hermes / gui / contactview.py

diff --git a/package/src/org/maemo/hermes/gui/contactview.py b/package/src/org/maemo/hermes/gui/contactview.py
index 569bb91..7c7def3 100644 (file)
--- a/package/src/org/maemo/hermes/gui/contactview.py
+++ b/package/src/org/maemo/hermes/gui/contactview.py
@@ -14,7 +14,7 @@ class ContactView(hildon.PannableArea):
     
     # -----------------------------------------------------------------------
     def __init__(self, contacts):
-        """Constructor. Passed a list of EContacts."""
+        """Constructor. Passed a list of Contacts."""
         
         hildon.PannableArea.__init__(self)
         self.contacts = contacts
@@ -23,16 +23,15 @@ class ContactView(hildon.PannableArea):
             if not contact.get_name():
                 continue
               
-            photo = contact.get_property('photo')
-            pi = cast(c_void_p(hash(photo)), POINTER(EContactPhoto))
+            pi = contact.get_photo()
             pixbuf = None
-            if pi.contents.data.uri.startswith("image/"):
+            if pi and pi.contents.data.uri.startswith("image/"):
                 data = string_at(pi.contents.data.inlined.data, pi.contents.data.inlined.length)
                 pixbuf_loader = gtk.gdk.PixbufLoader()
                 pixbuf_loader.write(data)
                 pixbuf_loader.close()
                 pixbuf = pixbuf_loader.get_pixbuf()
-            elif pi.contents.data.uri.startswith("file://"):
+            elif pi and pi.contents.data.uri.startswith("file://"):
                 filename = pi.contents.data.uri[7:]
                 pixbuf = gtk.gdk.pixbuf_new_from_file(filename)