[nautilus-actions: 18/19] Merge branch 'work'
- From: Pierre Wieser <pwieser src gnome org>
- To: svn-commits-list gnome org
- Subject: [nautilus-actions: 18/19] Merge branch 'work'
- Date: Tue, 9 Jun 2009 16:56:28 -0400 (EDT)
commit 1f51ce9fabc2398c53a5b987d67b0a4e9cc2bb94
Merge: bc508df... 0fb81e4...
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Jun 9 22:50:48 2009 +0200
Merge branch 'work'
ChangeLog | 129 ++++
configure.ac | 2 +-
src/common/Makefile.am | 8 +-
src/common/nact-action-profile.c | 422 +++++++++++---
src/common/nact-action-profile.h | 10 +-
src/common/nact-action.c | 301 +++++-----
src/common/nact-action.h | 10 +-
src/common/nact-gconf.c | 675 +++++++++++----------
src/common/nact-gconf.h | 2 +-
src/common/nact-iio-client.c | 154 -----
src/common/nact-iio-client.h | 73 ---
src/common/nact-iio-provider.c | 99 +---
src/common/nact-iio-provider.h | 12 +-
src/common/nact-io-client.c | 245 --------
src/common/nact-io-client.h | 78 ---
src/common/nact-object.c | 65 ++-
src/common/nact-object.h | 4 +
src/common/nact-pivot.c | 275 ++++++++-
src/common/nact-pivot.h | 25 +-
src/common/{uti-lists.c => nact-uti-lists.c} | 23 +-
src/common/{uti-lists.h => nact-uti-lists.h} | 9 +-
src/common/nautilus-actions-config.c | 2 +-
src/nact/Makefile.am | 8 +-
src/plugin/Makefile.am | 6 +-
src/plugin/nautilus-actions-test.c | 275 ---------
src/plugin/nautilus-actions-test.h | 42 --
src/plugin/nautilus-actions-utils.c | 186 ------
src/plugin/nautilus-actions-utils.h | 42 --
src/plugin/nautilus-actions.c | 366 ++++++------
src/utils/Makefile.am | 11 +-
src/utils/nautilus-actions-check-actions-change.c | 92 ---
31 files changed, 1530 insertions(+), 2121 deletions(-)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]