[emerillon: 50/50] Merge branch 'gtk3'

[Åukasz JernaÅ <ljernas src gnome org>]

commit 122ff3997eba5a8023aa393b593c7d555ca33fcb
Merge: 33fcc8a 14f650c
Author: Åukasz JernaÅ <deejay1 srem org>
Date:   Wed Sep 7 12:29:31 2011 +0200

    Merge branch 'gtk3'

 .gitignore                                         |   11 +-
 Makefile.am                                        |    6 +-
 TODO                                               |    7 +
 bindings/vala/create.sh                            |    2 +-
 bindings/vala/emerillon.deps                       |    4 +-
 bindings/vala/emerillon/emerillon.gi               |    4 +-
 bindings/vala/emerillon/emerillon.metadata         |   14 --
 configure.ac                                       |   18 +-
 cut-paste/empathy-cell-renderer-activatable.c      |    8 +-
 cut-paste/totem-plugin.h                           |  179 ++++++++++++++
 data/emerillon.pc.in                               |    2 +-
 emerillon/Makefile.am                              |   51 ++---
 emerillon/main.c                                   |   40 +++-
 emerillon/manager.c                                |  244 --------------------
 emerillon/manager.h                                |   62 -----
 emerillon/preferences.c                            |   26 ++-
 emerillon/sidebar.c                                |   34 ++--
 emerillon/sidebar.h                                |    4 +-
 emerillon/window.c                                 |   90 +++++++-
 plugins/Makefile.am                                |   20 +-
 plugins/copy-link/copy-link.c                      |   51 +---
 plugins/copy-link/copy-link.h                      |   59 -----
 ...ink.emerillon-plugin.in => copy-link.plugin.in} |    5 +-
 plugins/map-position/map-position.c                |   68 ++----
 plugins/map-position/map-position.h                |   59 -----
 ....emerillon-plugin.in => map-position.plugin.in} |    5 +-
 plugins/placemarks/add-dialog.c                    |    4 +-
 plugins/placemarks/manage-dialog.c                 |    2 +-
 plugins/placemarks/placemarks.c                    |   72 ++----
 plugins/placemarks/placemarks.h                    |   59 -----
 ...ks.emerillon-plugin.in => placemarks.plugin.in} |    5 +-
 plugins/search/search.c                            |  145 +++---------
 plugins/search/search.h                            |   59 -----
 ...search.emerillon-plugin.in => search.plugin.in} |    5 +-
 po/POTFILES.in                                     |    8 +-
 35 files changed, 499 insertions(+), 933 deletions(-)
---