[vinagre: 22/22] Merge branch 'libpeas'

[Jonh Wendell <jwendell src gnome org>]

commit 60a1d544845f341ea2cc394d13df3acfb16a7b04
Merge: 6708bb0 0a8f0ce
Author: Jonh Wendell <jwendell gnome org>
Date:   Fri Jul 30 23:40:37 2010 +0200

    Merge branch 'libpeas'

 Makefile.am                                |    4 +-
 configure.ac                               |   18 +-
 m4/libtool.m4                              |   40 +-
 m4/ltversion.m4                            |   10 +-
 plugin-loaders/Makefile.am                 |    3 -
 plugin-loaders/c/Makefile.am               |   24 -
 plugin-loaders/c/vinagre-plugin-loader-c.c |  182 ------
 plugin-loaders/c/vinagre-plugin-loader-c.h |   60 --
 plugins/rdp/rdp.vinagre-plugin.desktop.in  |    2 -
 plugins/rdp/vinagre-rdp-plugin.c           |   93 ++--
 plugins/rdp/vinagre-rdp-plugin.h           |   29 +-
 plugins/ssh/Makefile.am                    |    7 +-
 plugins/ssh/ssh.vinagre-plugin.desktop.in  |    2 -
 plugins/ssh/vinagre-ssh-plugin.c           |  112 ++--
 plugins/ssh/vinagre-ssh-plugin.h           |   27 +-
 plugins/vnc/Makefile.am                    |    9 +-
 plugins/vnc/vinagre-vnc-listener-dialog.c  |    5 +-
 plugins/vnc/vinagre-vnc-listener-dialog.h  |    3 +-
 plugins/vnc/vinagre-vnc-plugin.c           |  105 ++--
 plugins/vnc/vinagre-vnc-plugin.h           |   30 +-
 plugins/vnc/vnc.vinagre-plugin.desktop.in  |    2 -
 vinagre/Makefile.am                        |   58 ++-
 vinagre/vinagre-applet.c                   |   10 +-
 vinagre/vinagre-bookmarks-migration.c      |   12 +-
 vinagre/vinagre-bookmarks-ui.c             |   30 +-
 vinagre/vinagre-bookmarks.c                |   12 +-
 vinagre/vinagre-commands.c                 |    6 +-
 vinagre/vinagre-connect.c                  |   43 +-
 vinagre/vinagre-connection.c               |   53 +-
 vinagre/vinagre-connection.h               |    4 +-
 vinagre/vinagre-fav.c                      |   10 +-
 vinagre/vinagre-main.c                     |   21 +-
 vinagre/vinagre-mdns.c                     |   25 +-
 vinagre/vinagre-object-module.c            |  343 ----------
 vinagre/vinagre-object-module.h            |   94 ---
 vinagre/vinagre-plugin-dialog.c            |    6 +-
 vinagre/vinagre-plugin-info-priv.h         |   60 --
 vinagre/vinagre-plugin-info.c              |  397 ------------
 vinagre/vinagre-plugin-info.h              |   54 --
 vinagre/vinagre-plugin-loader.c            |  132 ----
 vinagre/vinagre-plugin-loader.h            |  107 ---
 vinagre/vinagre-plugin-manager.c           |  889 -------------------------
 vinagre/vinagre-plugin-manager.h           |   75 ---
 vinagre/vinagre-plugin.c                   |  605 -----------------
 vinagre/vinagre-plugin.h                   |  279 --------
 vinagre/vinagre-plugins-engine.c           |  972 +++++----------------------
 vinagre/vinagre-plugins-engine.h           |   67 +--
 vinagre/vinagre-protocol-ext.c             |  191 ++++++
 vinagre/vinagre-protocol-ext.h             |   60 ++
 vinagre/vinagre-protocol.c                 |  352 ++++++++++
 vinagre/vinagre-protocol.h                 |  104 +++
 vinagre/vinagre-tab.c                      |   40 +-
 vinagre/vinagre-utils.c                    |    4 +-
 vinagre/vinagre-utils.h                    |    3 +-
 vinagre/vinagre-window.c                   |   17 +-
 55 files changed, 1297 insertions(+), 4605 deletions(-)
---