[kupfer: 7/12] Merge remote-tracking branch 'karol/google_contacts'

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 9a2f4ce4082da413ef65a365f1955872d823e30e
Merge: 3d3173d 3d5e6d1
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Sat Feb 25 16:54:21 2012 +0100

    Merge remote-tracking branch 'karol/google_contacts'
    
    * karol/google_contacts:
      gmail: add images to all contact leaves
      obj.contacts: add optional images to all types of contacts leaves
      gmail: loading additional contacts data
      skype: update according to changes in obj.contacts classes
      contacts: add new type of contacts
      read all contact data from a Google contact.

 kupfer/obj/contacts.py          |  155 ++++++++++++++++++++++++++++++++++-----
 kupfer/plugin/gmail/__init__.py |  140 ++++++++++++++++++++++++-----------
 kupfer/plugin/skype.py          |   23 ++----
 3 files changed, 240 insertions(+), 78 deletions(-)
---