[nautilus-actions: 3/3] Merge branch 'hierarchy'

[Pierre Wieser <pwieser src gnome org>]

commit 529fa4456b612fcd67cf48e3379271f6343228b9
Merge: 3a8e7d9... 09219fb...
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jun 19 01:55:14 2009 +0200

    Merge branch 'hierarchy'

 ChangeLog                                          |   44 +
 m4/.gitignore                                      |    5 +
 src/common/Makefile.am                             |   30 +-
 .../{nact-action-profile.c => na-action-profile.c} |  186 +++---
 src/common/na-action-profile.h                     |   88 ++
 src/common/{nact-action.c => na-action.c}          |  255 ++++--
 src/common/na-action.h                             |   92 +++
 src/common/{nact-gconf-keys.h => na-gconf-keys.h}  |    8 +-
 src/common/{nact-gconf.c => na-gconf.c}            |  226 +++---
 src/common/{nact-gconf.h => na-gconf.h}            |   40 +-
 .../{nact-iio-provider.c => na-iio-provider.c}     |   95 ++-
 .../{nact-iio-provider.h => na-iio-provider.h}     |   34 +-
 src/common/{nact-object.c => na-object.c}          |   89 +--
 src/common/{nact-object.h => na-object.h}          |   50 +-
 src/common/{nact-pivot.c => na-pivot.c}            |  239 ++++--
 src/common/{nact-pivot.h => na-pivot.h}            |   61 +-
 src/common/{nact-uti-lists.c => na-utils.c}        |    6 +-
 src/common/{nact-uti-lists.h => na-utils.h}        |   18 +-
 src/common/nact-action-profile.h                   |   88 --
 src/common/nact-action.h                           |   87 --
 src/nact/Makefile.am                               |    2 +
 src/nact/base-application.c                        |  830 ++++++++++++++++++++
 src/nact/base-application.h                        |   96 +++
 src/nact/nact-application.c                        |  246 ++-----
 src/nact/nact-application.h                        |    9 +-
 src/nact/nact-main.c                               |    6 +-
 src/nact/nact.c                                    |  142 ++--
 src/nact/nact.h                                    |    3 +-
 src/plugin/nautilus-actions.c                      |   59 +-
 29 files changed, 2125 insertions(+), 1009 deletions(-)
---