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

[Pierre Wieser <pwieser src gnome org>]

commit 78adc7da0c2511c115f680fa34ae5fde4c0f14a1
Merge: a9e126a 34be635
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Feb 28 21:51:09 2010 +0100

    Merge branch 'refactor'

 ChangeLog                          |   63 ++++++++++++++++++++++
 TODO                               |    2 +
 src/api/na-ifactory-object.h       |    7 +--
 src/api/na-object-api.h            |    1 +
 src/api/na-object-item.h           |    1 -
 src/api/na-object.h                |    5 ++-
 src/core/na-factory-object.c       |   22 ++++++--
 src/core/na-iduplicable.c          |   18 ++++--
 src/core/na-object-action.c        |   56 +++++++-------------
 src/core/na-object-item-factory.c  |    6 +-
 src/core/na-object-item.c          |  102 +++++++++++++++++++++---------------
 src/core/na-object-menu.c          |   52 ++++++------------
 src/core/na-object-profile.c       |   44 ++++++---------
 src/core/na-object.c               |   92 ++++++++++++++++++++++----------
 src/core/na-pivot.c                |    1 +
 src/core/na-updater.c              |   12 ++--
 src/io-gconf/nagp-gconf-provider.c |    2 +-
 src/io-gconf/nagp-reader.c         |    4 +-
 src/io-gconf/nagp-writer.c         |   38 +++++++++++++
 src/io-gconf/nagp-writer.h         |    8 ++-
 src/nact/nact-iaction-tab.c        |   25 +--------
 src/nact/nact-iactions-list-bis.c  |    4 +-
 src/nact/nact-iactions-list.h      |    2 +-
 src/nact/nact-icommand-tab.c       |    9 ---
 src/nact/nact-iconditions-tab.c    |    6 --
 src/nact/nact-main-menubar.c       |   13 ++---
 src/nact/nact-window.c             |    3 -
 27 files changed, 347 insertions(+), 251 deletions(-)
---