[kupfer: 36/51] adapt Pidgin, Claws Mail

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 0304dcefff2ef76ebf0f2556a519455f79a58510
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Sat Jan 9 20:36:06 2010 +0100

    adapt Pidgin, Claws Mail

 kupfer/plugin/clawsmail.py |    6 +++---
 kupfer/plugin/pidgin.py    |    7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/kupfer/plugin/clawsmail.py b/kupfer/plugin/clawsmail.py
index b9aabac..4010d63 100644
--- a/kupfer/plugin/clawsmail.py
+++ b/kupfer/plugin/clawsmail.py
@@ -3,10 +3,10 @@ import os
 from xml.dom import minidom
 
 from kupfer.objects import Leaf, Action, Source
-from kupfer.objects import (TextLeaf, UrlLeaf, RunnableLeaf, FileLeaf,
-		AppLeafContentMixin )
+from kupfer.objects import TextLeaf, UrlLeaf, RunnableLeaf, FileLeaf
 from kupfer import utils
-from kupfer.helplib import FilesystemWatchMixin
+from kupfer.obj.apps import AppLeafContentMixin
+from kupfer.obj.helplib import FilesystemWatchMixin
 from kupfer.obj.grouping import ToplevelGroupingSource
 from kupfer.obj.contacts import EMAIL_KEY, ContactLeaf, EmailContact, email_from_leaf
 
diff --git a/kupfer/plugin/pidgin.py b/kupfer/plugin/pidgin.py
index ca808a6..9a4d9f6 100644
--- a/kupfer/plugin/pidgin.py
+++ b/kupfer/plugin/pidgin.py
@@ -2,13 +2,14 @@
 plugin'''
 import dbus
 
-from kupfer.objects import (Leaf, Action, Source, AppLeafContentMixin,
-		TextLeaf, TextSource)
+from kupfer.objects import Leaf, Action, Source, TextLeaf, TextSource
 from kupfer import pretty, scheduler
 from kupfer import icons
 from kupfer import plugin_support
-from kupfer.helplib import dbus_signal_connect_weakly, PicklingHelperMixin
+from kupfer.obj.apps import AppLeafContentMixin
+from kupfer.obj.helplib import PicklingHelperMixin, FilesystemWatchMixin
 from kupfer.obj.grouping import ToplevelGroupingSource
+from kupfer.weaklib import dbus_signal_connect_weakly
 from kupfer.obj.contacts import NAME_KEY, EMAIL_KEY, ContactLeaf, is_valid_email
 
 __kupfer_name__ = _("Pidgin")