[kupfer: 30/51] adjust Commands, Favorites, Trash

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 1018c36f540a4279ceef9e0a8380310dbd8049cd
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Sat Jan 9 17:31:54 2010 +0100

    adjust Commands, Favorites, Trash

 kupfer/plugin/commands.py  |    4 ++--
 kupfer/plugin/favorites.py |    3 ++-
 kupfer/plugin/trash.py     |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/kupfer/plugin/commands.py b/kupfer/plugin/commands.py
index 1f7f968..28dbccb 100644
--- a/kupfer/plugin/commands.py
+++ b/kupfer/plugin/commands.py
@@ -4,8 +4,8 @@ from os import access, R_OK, X_OK, path
 
 import gobject
 
-from kupfer.objects import TextSource, Leaf
-from kupfer.objects import TextLeaf, Execute
+from kupfer.objects import TextSource, Leaf, TextLeaf
+from kupfer.obj.fileactions import Execute
 from kupfer import utils, icons
 
 __kupfer_name__ = _("Shell Commands")
diff --git a/kupfer/plugin/favorites.py b/kupfer/plugin/favorites.py
index 025ffb8..5ea9ef1 100644
--- a/kupfer/plugin/favorites.py
+++ b/kupfer/plugin/favorites.py
@@ -1,7 +1,8 @@
 import collections
 import weakref
 
-from kupfer.objects import Leaf, Source, Action, PicklingHelperMixin
+from kupfer.objects import Leaf, Source, Action
+from kupfer.obj.helplib import PicklingHelperMixin
 from kupfer import utils, objects, pretty
 from kupfer import puid
 
diff --git a/kupfer/plugin/trash.py b/kupfer/plugin/trash.py
index 10b9671..32b0fc6 100644
--- a/kupfer/plugin/trash.py
+++ b/kupfer/plugin/trash.py
@@ -1,7 +1,7 @@
 import gio
 
-from kupfer.objects import Leaf, Action, Source
-from kupfer.objects import OpenDirectory, SourceLeaf
+from kupfer.objects import Leaf, Action, Source, SourceLeaf
+from kupfer.obj.fileactions import OpenDirectory
 from kupfer import utils, icons, pretty
 
 __kupfer_name__ = _("Trash")