[kupfer: 18/18] Merge Karol's patch queue on master

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 04bbd63c483cbefe8230679aa892452fabb77e14
Merge: c64a198 68dfd16
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Jan 22 20:54:20 2013 +0100

    Merge Karol's patch queue on master
    
    * karol/master:
      firefox: check is bookmarks file exists before loading it
      preferences: catch exceptions when loading .Desktop files
      preferences: prevent Kupfer crashing on broken .desktop files
      plugin top: fix for locales not using dot as decimal point.
      rhythmbox: use dbus to control rhythmbox and load library
      gui/preferences: update plugin info on activate/deactivate plugin by keyb.
      session_gnome: support Gnome3 for logoff/shutdown actions
      Added check for no alternatives when getting settings.
      websearch: find all search plugin from firefox/iceweasel
      trash +EmptyTrash action
      plugin_support: fix problems with save passwords in keyring lp1056686
      gtg: workaround for broken GetTasks method in GTG DBUS API
      calculator: change localized decimal point symbol to dot
      calculator: separate action for expression with and w/o =
      calculator: add missing operators (&|~); update description and manual
      calculator: Calculate action now valid for other mathematical operators
      dbus: fix problem with crashing kupfer

 help/C/plugin-calculator.page    |    4 ++
 kupfer/core/settings.py          |    2 +
 kupfer/plugin/calculator.py      |   55 ++++++++++++++++---
 kupfer/plugin/firefox_support.py |    2 +
 kupfer/plugin/gtg.py             |    2 +
 kupfer/plugin/rhythmbox.py       |  107 +++++++++++++++++++++++++++++++++-----
 kupfer/plugin/session_gnome.py   |   16 +++++-
 kupfer/plugin/top.py             |    2 +-
 kupfer/plugin/trash.py           |   26 +++++++++-
 kupfer/plugin/websearch.py       |   18 ++++++-
 kupfer/plugin_support.py         |    2 +-
 kupfer/ui/listen.py              |    2 +
 kupfer/ui/preferences.py         |   20 ++++++-
 kupfer/utils.py                  |    6 ++-
 14 files changed, 230 insertions(+), 34 deletions(-)
---