[kupfer: 3/12] skype: update according to changes in obj.contacts classes

[Ulrik Sverdrup <usverdrup src gnome org>]

commit ffaa0846592c90410f0e1c3b69635ead63b16065
Author: Karol BÄdkowski <karol bedkowski gmail com>
Date:   Sat Feb 5 13:25:23 2011 +0100

    skype: update according to changes in obj.contacts classes

 kupfer/plugin/skype.py |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/kupfer/plugin/skype.py b/kupfer/plugin/skype.py
index 5b08245..8121129 100644
--- a/kupfer/plugin/skype.py
+++ b/kupfer/plugin/skype.py
@@ -3,7 +3,7 @@ __kupfer_name__ = _("Skype")
 __kupfer_sources__ = ("ContactsSource", )
 __kupfer_actions__ = ("ChangeStatus", 'Chat', 'Call')
 __description__ = _("Access to Skype contacts")
-__version__ = "2010-01-07"
+__version__ = "2011-02-05"
 __author__ = "Karol BÄdkowski <karol bedkowski gmail com>"
 
 import dbus
@@ -14,7 +14,7 @@ from kupfer import pretty, icons
 from kupfer import plugin_support
 from kupfer.obj.apps import AppLeafContentMixin
 from kupfer.obj.grouping import ToplevelGroupingSource
-from kupfer.obj.contacts import ContactLeaf, NAME_KEY
+from kupfer.obj.contacts import ContactLeaf, SkypeContact
 
 
 
@@ -45,7 +45,7 @@ def _parse_response(response, prefix):
 
 
 class _SkypeNotify(dbus.service.Object):
-	def __init__(self, bus, callback): 
+	def __init__(self, bus, callback):
 		dbus.service.Object.__init__(self, bus, SKYPE_PATH_CLIENT)
 		self._callback = callback
 
@@ -73,7 +73,7 @@ class Skype(object):
 		except dbus.DBusException, err:
 			pretty.print_error(__name__, 'Skype', '__init__', err)
 			return
-		
+
 		self._dbus_name_owner_watch = bus.add_signal_receiver(
 				self._signal_dbus_name_owner_changed,
 				'NameOwnerChanged',
@@ -133,7 +133,7 @@ class Skype(object):
 			return
 		users =  skype.Invoke("SEARCH FRIENDS")
 		if not users.startswith('USERS '):
-			return 
+			return
 		users = users[6:].split(',')
 		for user in users:
 			user = user.strip()
@@ -172,20 +172,13 @@ class Skype(object):
 			skype.Invoke("SET USERSTATUS %s" % status)
 
 
-class Contact(ContactLeaf):
-	grouping_slots = ContactLeaf.grouping_slots + (SKYPE_KEY, )
-
+class Contact(SkypeContact):
 	def __init__(self, name, handle, status):
-		slots = {SKYPE_KEY: handle, NAME_KEY: name}
-		ContactLeaf.__init__(self, slots, name)
+		SkypeContact.__init__(self, handle, name)
 		self.kupfer_add_alias(handle)
-
 		self._description = _("[%(status)s] %(userid)s") % \
 			dict(status=status, userid=handle)
 
-	def repr_key(self):
-		return self.object[SKYPE_KEY]
-
 	def get_description(self):
 		return self._description
 
@@ -273,7 +266,7 @@ class ContactsSource(AppLeafContentMixin, ToplevelGroupingSource):
 
 	def __init__(self, name=_('Skype Contacts')):
 		super(ContactsSource, self).__init__(name, "Contacts")
-		self._version = 2
+		self._version = 3
 
 	def get_items(self):
 		pretty.print_debug(__name__, 'ContactsSource', 'get_items')