[kupfer] Fix plugins importing transition imports from old location

[Ulrik Sverdrup <usverdrup src gnome org>]

commit bb06d4f90456ef4f7d2a21685878800dc2ca64d6
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Sat Feb 6 14:37:33 2010 +0100

    Fix plugins importing transition imports from old location

 kupfer/plugin/abiword.py  |    8 +++-----
 kupfer/plugin/putty.py    |    5 +++--
 kupfer/plugin/tsclient.py |    5 +++--
 kupfer/plugin/vinagre.py  |    5 +++--
 4 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/kupfer/plugin/abiword.py b/kupfer/plugin/abiword.py
index 8251285..8214036 100644
--- a/kupfer/plugin/abiword.py
+++ b/kupfer/plugin/abiword.py
@@ -9,11 +9,9 @@ import xml.etree.cElementTree as ElementTree
 
 import gio
 
-from kupfer.objects import (Leaf, Action, Source,
-		AppLeaf, FileLeaf, UrlLeaf, PicklingHelperMixin, AppLeafContentMixin)
-from kupfer import objects
-from kupfer import launch, icons
-
+from kupfer.objects import Leaf, Action, Source, AppLeaf, FileLeaf, UrlLeaf
+from kupfer.obj.helplib import PicklingHelperMixin
+from kupfer.obj.apps import AppLeafContentMixin
 
 def get_abiword_files(xmlpth, application="abiword"):
 	"""
diff --git a/kupfer/plugin/putty.py b/kupfer/plugin/putty.py
index 172fe4a..2b8517b 100644
--- a/kupfer/plugin/putty.py
+++ b/kupfer/plugin/putty.py
@@ -13,8 +13,9 @@ __author__ = "Karol BÄ?dkowski <karol bedkowski gmail com>"
 import os
 import urllib
 
-from kupfer.objects import Action, AppLeafContentMixin
-from kupfer.helplib import FilesystemWatchMixin, PicklingHelperMixin
+from kupfer.objects import Action
+from kupfer.obj.helplib import FilesystemWatchMixin, PicklingHelperMixin
+from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import utils, icons
 from kupfer.obj.grouping import ToplevelGroupingSource 
 from kupfer.obj.hosts import HOST_NAME_KEY, HostLeaf, HOST_ADDRESS_KEY, \
diff --git a/kupfer/plugin/tsclient.py b/kupfer/plugin/tsclient.py
index c90c286..6bd8ef2 100644
--- a/kupfer/plugin/tsclient.py
+++ b/kupfer/plugin/tsclient.py
@@ -10,8 +10,9 @@ __author__ = "Karol BÄ?dkowski <karol bedkowski gmail com>"
 
 import os
 
-from kupfer.objects import Action, AppLeafContentMixin
-from kupfer.helplib import FilesystemWatchMixin, PicklingHelperMixin
+from kupfer.objects import Action
+from kupfer.obj.helplib import FilesystemWatchMixin, PicklingHelperMixin
+from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import utils, icons
 from kupfer.obj.grouping import ToplevelGroupingSource 
 from kupfer.obj.hosts import HOST_NAME_KEY, HostLeaf
diff --git a/kupfer/plugin/vinagre.py b/kupfer/plugin/vinagre.py
index 8990225..a010cba 100644
--- a/kupfer/plugin/vinagre.py
+++ b/kupfer/plugin/vinagre.py
@@ -13,8 +13,9 @@ import os
 import gio
 from xml.etree import cElementTree as ElementTree
 
-from kupfer.objects import Action, AppLeafContentMixin, UrlLeaf
-from kupfer.helplib import FilesystemWatchMixin, PicklingHelperMixin
+from kupfer.objects import Action, UrlLeaf
+from kupfer.obj.helplib import FilesystemWatchMixin, PicklingHelperMixin
+from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import utils, icons
 from kupfer.obj.grouping import ToplevelGroupingSource 
 from kupfer.obj.hosts import HostServiceLeaf, HOST_ADDRESS_KEY, \