[kupfer: 17/19] Merge branch 'next'

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 626500a309a4783ea9b6db0665908dd3e1e2be2b
Merge: 174b291 359df88
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Mon Feb 1 18:33:47 2010 +0100

    Merge branch 'next'

 contrib/evilplugin.py                |    6 +-
 contrib/icon_names.py                |   20 ++--
 contrib/runningapplications.py       |   13 +-
 kupfer/core/data.py                  |   28 +++--
 kupfer/core/plugins.py               |  204 +++++++++++++++++++++++++--------
 kupfer/obj/base.py                   |   15 ++-
 kupfer/obj/grouping.py               |    4 +-
 kupfer/obj/objects.py                |    6 +-
 kupfer/plugin/abiword.py             |   11 +-
 kupfer/plugin/applications.py        |   15 ++-
 kupfer/plugin/apt_tools.py           |   15 ++-
 kupfer/plugin/audacious.py           |   17 ++--
 kupfer/plugin/calculator.py          |   11 +-
 kupfer/plugin/chromium.py            |   11 +-
 kupfer/plugin/clawsmail.py           |   13 +-
 kupfer/plugin/clipboard.py           |   11 +-
 kupfer/plugin/commands.py            |   15 ++-
 kupfer/plugin/core/__init__.py       |   19 ++--
 kupfer/plugin/core/text.py           |    6 +-
 kupfer/plugin/defaultmail.py         |   11 +-
 kupfer/plugin/devhelp.py             |    7 +-
 kupfer/plugin/dictionary.py          |    7 +-
 kupfer/plugin/documents.py           |   16 ++--
 kupfer/plugin/epiphany.py            |   12 +-
 kupfer/plugin/favorites.py           |   13 +-
 kupfer/plugin/fileactions.py         |   19 ++--
 kupfer/plugin/gajim.py               |   14 +-
 kupfer/plugin/gnome_terminal.py      |   14 +-
 kupfer/plugin/google.py              |   69 ++++++++++++
 kupfer/plugin/google_translate.py    |   14 +-
 kupfer/plugin/higherorder.py         |   11 +-
 kupfer/plugin/image.py               |   17 ++--
 kupfer/plugin/kupfer_plugins.py      |   11 +-
 kupfer/plugin/locate.py              |   15 ++-
 kupfer/plugin/nautilusselection.py   |   12 +-
 kupfer/plugin/notes.py               |   20 ++--
 kupfer/plugin/notification.py        |    9 +-
 kupfer/plugin/openoffice.py          |   12 +-
 kupfer/plugin/opera.py               |   12 +-
 kupfer/plugin/pidgin.py              |   25 ++--
 kupfer/plugin/putty.py               |   18 ++--
 kupfer/plugin/rhythmbox.py           |   12 +-
 kupfer/plugin/rst.py                 |   11 +-
 kupfer/plugin/screen.py              |   11 +-
 kupfer/plugin/services.py            |   11 +-
 kupfer/plugin/session_gnome.py       |    4 +-
 kupfer/plugin/session_xfce.py        |    5 +-
 kupfer/plugin/shorten_links.py       |   11 +-
 kupfer/plugin/show_text.py           |    9 +-
 kupfer/plugin/skype.py               |   16 ++--
 kupfer/plugin/templates.py           |   13 +-
 kupfer/plugin/thunar.py              |  127 +++++++++++++++++++++
 kupfer/plugin/thunderbird.py         |   12 +-
 kupfer/plugin/top.py                 |   11 +-
 kupfer/plugin/tracker.py             |   25 ++--
 kupfer/plugin/trash.py               |   11 +-
 kupfer/plugin/triggers.py            |   20 ++--
 kupfer/plugin/truecrypt.py           |   13 +-
 kupfer/plugin/tsclient.py            |   14 +-
 kupfer/plugin/urlactions.py          |   15 ++-
 kupfer/plugin/vinagre.py             |   16 ++--
 kupfer/plugin/virtualbox/__init__.py |    9 +-
 kupfer/plugin/volumes.py             |   11 +-
 kupfer/plugin/websearch.py           |   21 ++--
 kupfer/plugin/wikipedia.py           |   11 +-
 kupfer/plugin/windows.py             |   16 +--
 kupfer/plugin/zim.py                 |   17 ++--
 kupfer/ui/preferences.py             |    7 +-
 68 files changed, 803 insertions(+), 454 deletions(-)
---
diff --cc kupfer/ui/preferences.py
index 5c1718c,0d204e9..8b32e5d
--- a/kupfer/ui/preferences.py
+++ b/kupfer/ui/preferences.py
@@@ -353,8 -317,12 +353,13 @@@ class PreferencesWindowController (pret
  			label.set_alignment(0, 0)
  			label.set_markup(u"<b>%s</b>\n%s" %
  					(_("Plugin could not be read due to an error:"), error))
 +			label.set_selectable(True)
  			about.pack_start(label, False)
+ 		elif not plugins.is_plugin_loaded(plugin_id):
+ 			label = gtk.Label()
+ 			label.set_alignment(0, 0)
+ 			label.set_text(u"(%s)" % _("disabled"))
+ 			about.pack_start(label, False)
  
  		wid = self._make_plugin_info_widget(plugin_id)
  		about.pack_start(wid, False)