[kupfer] Update many plugins for new imports and initialize

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 1d4ebe2fb6b845efe3a048f66d7ea9eba9c67f18
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Jan 12 18:10:10 2010 +0100

    Update many plugins for new imports and initialize
    
    Use new imports places for some objects (the mixins). At the same time
    we convert some plugins to use Source.initialize instead of
    unpickle_finish if appropriate.

 kupfer/plugin/chromium.py            |    3 ++-
 kupfer/plugin/epiphany.py            |    3 ++-
 kupfer/plugin/openoffice.py          |    5 ++---
 kupfer/plugin/opera.py               |   13 +++++++------
 kupfer/plugin/skype.py               |    3 ++-
 kupfer/plugin/thunderbird.py         |    5 +++--
 kupfer/plugin/virtualbox/__init__.py |   10 ++++------
 7 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/kupfer/plugin/chromium.py b/kupfer/plugin/chromium.py
index 2854978..f159456 100644
--- a/kupfer/plugin/chromium.py
+++ b/kupfer/plugin/chromium.py
@@ -1,8 +1,9 @@
 import os
 
-from kupfer.objects import Leaf, Action, Source, AppLeafContentMixin
+from kupfer.objects import Leaf, Action, Source
 from kupfer.objects import UrlLeaf
 from kupfer import config, plugin_support
+from kupfer.obj.apps import AppLeafContentMixin
 
 __kupfer_name__ = _("Chromium Bookmarks")
 __kupfer_sources__ = ("BookmarksSource", )
diff --git a/kupfer/plugin/epiphany.py b/kupfer/plugin/epiphany.py
index e55716d..c39d606 100644
--- a/kupfer/plugin/epiphany.py
+++ b/kupfer/plugin/epiphany.py
@@ -1,7 +1,8 @@
 import os
 
-from kupfer.objects import Leaf, Action, Source, AppLeafContentMixin
+from kupfer.objects import Leaf, Action, Source
 from kupfer.objects import UrlLeaf
+from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import plugin_support
 
 from kupfer.plugin import epiphany_support
diff --git a/kupfer/plugin/openoffice.py b/kupfer/plugin/openoffice.py
index 46b590b..a9e2de1 100644
--- a/kupfer/plugin/openoffice.py
+++ b/kupfer/plugin/openoffice.py
@@ -5,7 +5,7 @@ from xml.etree import cElementTree as ElementTree
 import gio
 
 from kupfer.objects import Source, FileLeaf, UrlLeaf, AppLeaf
-from kupfer.helplib import PicklingHelperMixin
+from kupfer.obj.helplib import PicklingHelperMixin
 
 __kupfer_name__ = _("OpenOffice")
 __kupfer_sources__ = ("RecentsSource", )
@@ -60,12 +60,11 @@ class RecentsSource (MultiAppContentMixin, Source, PicklingHelperMixin):
 
 	def __init__(self, name=_("OpenOffice Recent Items")):
 		Source.__init__(self, name)
-		self.unpickle_finish()
 
 	def pickle_prepare(self):
 		self.monitor = None
 
-	def unpickle_finish(self):
+	def initialize(self):
 		hist_file_path = _get_history_file_path()
 		if not hist_file_path:
 			return
diff --git a/kupfer/plugin/opera.py b/kupfer/plugin/opera.py
index 145ba06..ed87765 100644
--- a/kupfer/plugin/opera.py
+++ b/kupfer/plugin/opera.py
@@ -4,15 +4,15 @@ from __future__ import with_statement
 import codecs
 import os
 
-from kupfer.objects import Source, UrlLeaf, AppLeafContentMixin
-from kupfer import plugin_support, objects
-from kupfer.helplib import PicklingHelperMixin, FilesystemWatchMixin
+from kupfer.objects import Source, UrlLeaf
+from kupfer import plugin_support
+from kupfer.obj.apps import ApplicationSource
 
 
 __kupfer_name__ = _("Opera Bookmarks")
 __kupfer_sources__ = ("BookmarksSource", )
 __description__ = _("Index of Opera bookmarks")
-__version__ = "0.1"
+__version__ = "2010-01-12"
 __author__ = "Karol BÄ?dkowski <karol bedkowski gmail com>"
 
 __kupfer_settings__ = plugin_support.PluginSettings(
@@ -21,8 +21,7 @@ __kupfer_settings__ = plugin_support.PluginSettings(
 
 BOOKMARKS_FILE = "bookmarks.adr"
 
-class BookmarksSource(AppLeafContentMixin, Source, PicklingHelperMixin,
-		FilesystemWatchMixin):
+class BookmarksSource(ApplicationSource):
 	appleaf_content_id = "opera"
 
 	def __init__(self, name=_("Opera Bookmarks")):
@@ -32,6 +31,8 @@ class BookmarksSource(AppLeafContentMixin, Source, PicklingHelperMixin,
 	def unpickle_finish(self):
 		self._opera_home = os.path.expanduser("~/.opera/")
 		self._bookmarks_path = os.path.join(self._opera_home, BOOKMARKS_FILE)
+
+	def initialize(self):
 		self.monitor_token = self.monitor_directories(self._opera_home)
 
 	def monitor_include_file(self, gfile):
diff --git a/kupfer/plugin/skype.py b/kupfer/plugin/skype.py
index 67c2f11..d98a4b4 100644
--- a/kupfer/plugin/skype.py
+++ b/kupfer/plugin/skype.py
@@ -2,9 +2,10 @@
 import dbus
 
 from kupfer.objects import Leaf, Action, Source
-from kupfer.objects import AppLeafContentMixin, AppLeaf
+from kupfer.objects import AppLeaf
 from kupfer import pretty
 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
 
diff --git a/kupfer/plugin/thunderbird.py b/kupfer/plugin/thunderbird.py
index 00b96fb..bba8547 100644
--- a/kupfer/plugin/thunderbird.py
+++ b/kupfer/plugin/thunderbird.py
@@ -5,8 +5,9 @@ from __future__ import with_statement
 import os
 
 from kupfer.objects import Leaf, Action, Source
-from kupfer.objects import TextLeaf, UrlLeaf, RunnableLeaf, AppLeafContentMixin
-from kupfer.helplib import FilesystemWatchMixin
+from kupfer.objects import TextLeaf, UrlLeaf, RunnableLeaf
+from kupfer.obj.apps import AppLeafContentMixin
+from kupfer.obj.helplib import FilesystemWatchMixin
 from kupfer import utils, icons
 from kupfer.obj.grouping import ToplevelGroupingSource
 from kupfer.obj.contacts import EMAIL_KEY, ContactLeaf, EmailContact, email_from_leaf
diff --git a/kupfer/plugin/virtualbox/__init__.py b/kupfer/plugin/virtualbox/__init__.py
index adbec26..50a7ef2 100644
--- a/kupfer/plugin/virtualbox/__init__.py
+++ b/kupfer/plugin/virtualbox/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: UTF-8 -*-
 
-from kupfer.objects import Leaf, Action, Source, AppLeafContentMixin
-from kupfer.helplib import PicklingHelperMixin, FilesystemWatchMixin
+from kupfer.objects import Leaf, Action, Source
 from kupfer import pretty, plugin_support
+from kupfer.obj.apps import ApplicationSource
 
 __kupfer_name__ = _("VirtualBox")
 __kupfer_sources__ = ("VBoxMachinesSource", )
@@ -75,15 +75,13 @@ class VMAction(Action):
 		vbox_support.vm_action(self.command, leaf.object)
 
 
-class VBoxMachinesSource(AppLeafContentMixin, Source, PicklingHelperMixin, 
-		FilesystemWatchMixin):
+class VBoxMachinesSource(ApplicationSource):
 	appleaf_content_id = vbox_support.APP_ID
 
 	def __init__(self, name=_("VirtualBox Machines")):
 		Source.__init__(self, name)
-		self.unpickle_finish()
 
-	def unpickle_finish(self):
+	def initialize(self):
 		if vbox_support.MONITORED_DIRS:
 			self.monitor_token = self.monitor_directories(
 					*vbox_support.MONITORED_DIRS)