[kupfer: 33/51] Adjust many plugins for reorganisation

[Ulrik Sverdrup <usverdrup src gnome org>]

commit a8bbcc6edd78198055ed7e7146e06082b53002c0
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Sat Jan 9 18:27:31 2010 +0100

    Adjust many plugins for reorganisation

 kupfer/plugin/audacious.py         |    4 ++--
 kupfer/plugin/clipboard.py         |    2 +-
 kupfer/plugin/documents.py         |    2 +-
 kupfer/plugin/firefox.py           |    3 ++-
 kupfer/plugin/gnome_terminal.py    |    8 ++++----
 kupfer/plugin/nautilusselection.py |    6 ++++--
 kupfer/plugin/rhythmbox.py         |    3 ++-
 kupfer/plugin/screen.py            |    4 ++--
 kupfer/plugin/templates.py         |    4 ++--
 kupfer/plugin/tracker.py           |    4 ++--
 kupfer/plugin/windows.py           |    3 ++-
 kupfer/plugin/zim.py               |    4 ++--
 12 files changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/kupfer/plugin/audacious.py b/kupfer/plugin/audacious.py
index baffb3d..26a45dd 100644
--- a/kupfer/plugin/audacious.py
+++ b/kupfer/plugin/audacious.py
@@ -1,8 +1,8 @@
 import subprocess
 
 from kupfer.objects import Leaf, Source, Action
-from kupfer.objects import (AppLeaf, RunnableLeaf, SourceLeaf,
-		AppLeafContentMixin)
+from kupfer.objects import AppLeaf, RunnableLeaf, SourceLeaf
+from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import objects, icons, utils
 from kupfer import plugin_support
 from kupfer import kupferstring
diff --git a/kupfer/plugin/clipboard.py b/kupfer/plugin/clipboard.py
index 6be6b72..4ef1e84 100644
--- a/kupfer/plugin/clipboard.py
+++ b/kupfer/plugin/clipboard.py
@@ -4,7 +4,7 @@ import gtk
 
 from kupfer.objects import Source, Action, TextLeaf, Leaf
 from kupfer import utils, plugin_support
-from kupfer.helplib import gobject_connect_weakly
+from kupfer.weaklib import gobject_connect_weakly
 
 __kupfer_name__ = _("Clipboards")
 __kupfer_sources__ = ("ClipboardSource", )
diff --git a/kupfer/plugin/documents.py b/kupfer/plugin/documents.py
index 8a83488..81e93b6 100644
--- a/kupfer/plugin/documents.py
+++ b/kupfer/plugin/documents.py
@@ -7,7 +7,7 @@ from kupfer.objects import (Leaf, Action, Source,
 		AppLeaf, FileLeaf, UrlLeaf, )
 from kupfer import objects, plugin_support
 from kupfer import launch, icons
-from kupfer.helplib import gobject_connect_weakly
+from kupfer.weaklib import gobject_connect_weakly
 
 __kupfer_name__ = _("Documents")
 __kupfer_sources__ = ("RecentsSource", "PlacesSource", )
diff --git a/kupfer/plugin/firefox.py b/kupfer/plugin/firefox.py
index add4ad6..ee803b1 100644
--- a/kupfer/plugin/firefox.py
+++ b/kupfer/plugin/firefox.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
 
 __kupfer_name__ = _("Firefox Bookmarks")
diff --git a/kupfer/plugin/gnome_terminal.py b/kupfer/plugin/gnome_terminal.py
index eb12575..a51b0b1 100644
--- a/kupfer/plugin/gnome_terminal.py
+++ b/kupfer/plugin/gnome_terminal.py
@@ -2,8 +2,8 @@ import os
 
 import glib
 
-from kupfer.objects import Source, Leaf, Action, \
-    AppLeafContentMixin, PicklingHelperMixin
+from kupfer.objects import Leaf, Action
+from kupfer.obj.apps import ApplicationSource
 from kupfer import utils, icons
 
 __kupfer_name__ = _("Gnome Terminal Profiles")
@@ -44,12 +44,12 @@ class OpenSession(Action):
 		return icons.ComposedIcon("gtk-execute", "terminal")
 
 
-class SessionsSource(AppLeafContentMixin, Source, PicklingHelperMixin):
+class SessionsSource(ApplicationSource):
 	""" Yield Gnome Terminal profiles """
 	appleaf_content_id = 'gnome-terminal'
 
 	def __init__(self):
-		Source.__init__(self, name=_("Gnome Terminal Profiles"))
+		ApplicationSource.__init__(self, name=_("Gnome Terminal Profiles"))
 
 	def get_items(self):
 		gc = gconf.client_get_default()
diff --git a/kupfer/plugin/nautilusselection.py b/kupfer/plugin/nautilusselection.py
index 63a1905..5cf1752 100644
--- a/kupfer/plugin/nautilusselection.py
+++ b/kupfer/plugin/nautilusselection.py
@@ -4,8 +4,10 @@ import dbus
 import gobject
 
 from kupfer.objects import Source, Leaf
-from kupfer.objects import FileLeaf, SourceLeaf, MultipleLeaf
-from kupfer.helplib import DbusWeakCallback, PicklingHelperMixin
+from kupfer.objects import FileLeaf, SourceLeaf
+from kupfer.obj.compose import MultipleLeaf
+from kupfer.obj.helplib import PicklingHelperMixin
+from kupfer.weaklib import DbusWeakCallback
 from kupfer import plugin_support
 
 __kupfer_name__ = _("Selected File")
diff --git a/kupfer/plugin/rhythmbox.py b/kupfer/plugin/rhythmbox.py
index 0d89d0d..e9fab9f 100644
--- a/kupfer/plugin/rhythmbox.py
+++ b/kupfer/plugin/rhythmbox.py
@@ -4,8 +4,9 @@ from hashlib import md5
 import gio
 
 from kupfer.objects import (Leaf, Source, AppLeaf, Action, RunnableLeaf,
-		SourceLeaf, AppLeafContentMixin)
+		SourceLeaf )
 from kupfer import objects, icons, utils, config
+from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import plugin_support
 from kupfer.plugin import rhythmbox_support
 
diff --git a/kupfer/plugin/screen.py b/kupfer/plugin/screen.py
index ab05780..6c199e8 100644
--- a/kupfer/plugin/screen.py
+++ b/kupfer/plugin/screen.py
@@ -1,8 +1,8 @@
 import os
 
 from kupfer.objects import Leaf, Action, Source
-from kupfer.helplib import FilesystemWatchMixin
-from kupfer import utils, objects
+from kupfer.obj.helplib import FilesystemWatchMixin
+from kupfer import utils
 
 __kupfer_name__ = _("GNU Screen")
 __kupfer_sources__ = ("ScreenSessionsSource", )
diff --git a/kupfer/plugin/templates.py b/kupfer/plugin/templates.py
index 039f48f..2b091d5 100644
--- a/kupfer/plugin/templates.py
+++ b/kupfer/plugin/templates.py
@@ -5,8 +5,8 @@ import glib
 
 from kupfer.objects import Leaf, Action, Source, FileLeaf
 from kupfer import icons, utils
-from kupfer import helplib
-from kupfer.helplib import FilesystemWatchMixin
+from kupfer.obj import helplib
+from kupfer.obj.helplib import FilesystemWatchMixin
 from kupfer import plugin_support
 
 __kupfer_name__ = _("Document Templates")
diff --git a/kupfer/plugin/tracker.py b/kupfer/plugin/tracker.py
index 3b6ec0e..85101f7 100644
--- a/kupfer/plugin/tracker.py
+++ b/kupfer/plugin/tracker.py
@@ -4,8 +4,8 @@ from xml.etree.cElementTree import ElementTree
 import gobject
 
 from kupfer.objects import Action, Source, Leaf
-from kupfer.objects import (TextLeaf, ConstructFileLeaf,
-		SourceLeaf, TextSource, FileLeaf)
+from kupfer.objects import TextLeaf, SourceLeaf, TextSource, FileLeaf
+from kupfer.obj.objects import ConstructFileLeaf
 from kupfer import utils, pretty
 from kupfer import plugin_support
 
diff --git a/kupfer/plugin/windows.py b/kupfer/plugin/windows.py
index cfbe9b5..98e7d6f 100644
--- a/kupfer/plugin/windows.py
+++ b/kupfer/plugin/windows.py
@@ -2,7 +2,8 @@ import gtk
 
 from kupfer.objects import Leaf, Action, Source
 from kupfer.ui import keybindings
-from kupfer.helplib import gobject_connect_weakly, PicklingHelperMixin
+from kupfer.weaklib import gobject_connect_weakly
+from kupfer.obj.helplib import PicklingHelperMixin
 
 __kupfer_name__ = _("Window List")
 __kupfer_sources__ = ("WindowsSource", "WorkspacesSource", )
diff --git a/kupfer/plugin/zim.py b/kupfer/plugin/zim.py
index 6a940f5..8cc6443 100644
--- a/kupfer/plugin/zim.py
+++ b/kupfer/plugin/zim.py
@@ -5,8 +5,8 @@ import os
 
 import glib
 
-from kupfer.objects import (Leaf, Action, Source, TextLeaf,
-		FilesystemWatchMixin, TextSource, AppLeafContentMixin)
+from kupfer.objects import Leaf, Action, Source, TextLeaf, TextSource
+from kupfer.obj.apps import AppLeafContentMixin
 from kupfer import config, utils, pretty, icons, plugin_support
 
 __kupfer_name__ = _("Zim")