[gedit/dbus: 6/6] Merge branch 'master' into dbus

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 809b55e69880795a860ea848a4ec2bf99085fdf3
Merge: c96cb99 5f5e344
Author: Jesse van den Kieboom <jesse vandenkieboom epfl ch>
Date:   Tue May 4 13:00:25 2010 +0200

    Merge branch 'master' into dbus

 gedit/gedit-app-osx.c                              |   22 ++++++
 gedit/gedit-app-osx.h                              |   22 ++++++
 gedit/gedit-app-win32.c                            |    2 +-
 gedit/gedit-app-x11.c                              |   22 ++++++
 gedit/gedit-app-x11.h                              |   22 ++++++
 gedit/gedit-message-bus.c                          |   22 ++++++
 gedit/gedit-message-bus.h                          |   22 ++++++
 gedit/gedit-message-type.c                         |   22 ++++++
 gedit/gedit-message-type.h                         |   22 ++++++
 gedit/gedit-message.c                              |   22 ++++++
 gedit/gedit-message.h                              |   22 ++++++
 gedit/gedit-osx-delegate.h                         |   22 ++++++
 gedit/gedit-osx-delegate.m                         |   24 ++++++-
 plugin-loaders/python/bindings/gedit.defs          |   23 +++----
 plugin-loaders/python/bindings/gedit.override      |    1 -
 plugin-loaders/python/gedit-plugin-loader-python.c |   33 +++++----
 plugins/externaltools/tools/manager.py             |    2 +-
 plugins/filebrowser/gedit-file-bookmarks-store.c   |   23 ++++--
 plugins/filebrowser/gedit-file-browser-messages.c  |    2 -
 plugins/filebrowser/gedit-file-browser-plugin.c    |   12 +++
 plugins/filebrowser/gedit-file-browser-store.c     |   74 ++++++++++++++------
 plugins/filebrowser/gedit-file-browser-utils.c     |    2 +
 plugins/filebrowser/gedit-file-browser-view.c      |   21 +++++-
 plugins/filebrowser/gedit-file-browser-widget.c    |   55 ++++++++++++++-
 plugins/snippets/snippets/Completion.py            |   17 +++++
 plugins/snippets/snippets/Exporter.py              |   17 +++++
 plugins/snippets/snippets/Importer.py              |   17 +++++
 plugins/snippets/snippets/LanguageManager.py       |   17 +++++
 plugins/snippets/snippets/Manager.py               |    2 +-
 plugins/sort/gedit-sort-plugin.c                   |    9 ++-
 plugins/spell/gedit-spell-language-dialog.c        |    9 ++-
 plugins/time/gedit-time-plugin.c                   |   16 +++--
 32 files changed, 535 insertions(+), 85 deletions(-)
---