[nautilus: 24/24] Merge branch 'freedesktop-dbus' - bgo#636269

[Federico Mena Quintero <federico src gnome org>]

commit 6ed0cae9df696b816309b6c6d8fdb2660c66b922
Merge: 11fa184 f01e2e9
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Dec 14 12:30:52 2011 -0600

    Merge branch 'freedesktop-dbus' - bgo#636269
    
    This adds an implementation for the DBus interface org.freedesktop.FileManager1.
    
    This lets applications call the file manager to show a file within a folder,
    to show a folder's contents, or to show a file's properties.
    
    The main work behind this is by Akshay Gupta <kitallis gmail com>,
    done during the Google Summer of Code 2011.

 data/Makefile.am                             |    7 +-
 data/freedesktop-dbus-interfaces.xml         |   36 +++
 data/org.freedesktop.FileManager1.service.in |    3 +
 src/.gitignore                               |    1 +
 src/Makefile.am                              |   18 ++
 src/nautilus-application.c                   |   29 +++
 src/nautilus-application.h                   |    5 +
 src/nautilus-freedesktop-dbus.c              |  316 ++++++++++++++++++++++++++
 src/nautilus-freedesktop-dbus.h              |   31 +++
 src/nautilus-places-sidebar.c                |    2 +-
 src/nautilus-properties-window.c             |   47 +++--
 src/nautilus-properties-window.h             |    5 +-
 src/nautilus-tree-sidebar.c                  |    4 +-
 src/nautilus-view.c                          |    6 +-
 14 files changed, 487 insertions(+), 23 deletions(-)
---