[nautilus-actions] Refactoring: private/ and runtime/ merged into core/

[Pierre Wieser <pwieser src gnome org>]

commit 4eaa1fc8a12271ca8350e7538a0721830ddf3dbf
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Feb 15 14:37:43 2010 +0100

    Refactoring: private/ and runtime/ merged into core/

 ChangeLog                                       |    1 +
 configure.ac                                    |    8 ++++----
 src/Makefile.am                                 |    3 +--
 src/{runtime => core}/Makefile.am               |    0
 src/{runtime => core}/README                    |    0
 src/{runtime => core}/na-gconf-utils.c          |    0
 src/{runtime => core}/na-gconf-utils.h          |    0
 src/{private => core}/na-gnome-vfs-uri.c        |    0
 src/{private => core}/na-gnome-vfs-uri.h        |    0
 src/{runtime => core}/na-iabout.c               |    0
 src/{runtime => core}/na-iabout.h               |    0
 src/{private => core}/na-iduplicable.c          |    0
 src/{private => core}/na-iduplicable.h          |    0
 src/{runtime => core}/na-io-provider.c          |    0
 src/{runtime => core}/na-io-provider.h          |    0
 src/{runtime => core}/na-ipivot-consumer.c      |    0
 src/{runtime => core}/na-ipivot-consumer.h      |    0
 src/{runtime => core}/na-iprefs.c               |    0
 src/{runtime => core}/na-iprefs.h               |    0
 src/{runtime => core}/na-module.c               |    0
 src/{runtime => core}/na-module.h               |    0
 src/{private => core}/na-object-action-class.h  |    0
 src/{private => core}/na-object-action-fn.h     |    0
 src/{private => core}/na-object-action-priv.h   |    0
 src/{private => core}/na-object-action.c        |    0
 src/{private => core}/na-object-class.h         |    0
 src/{private => core}/na-object-fn.h            |    0
 src/{private => core}/na-object-id-class.h      |    0
 src/{private => core}/na-object-id-fn.h         |    0
 src/{private => core}/na-object-id-priv.h       |    0
 src/{private => core}/na-object-id.c            |    0
 src/{private => core}/na-object-item-class.h    |    0
 src/{private => core}/na-object-item-fn.h       |    0
 src/{private => core}/na-object-item-priv.h     |    0
 src/{private => core}/na-object-item.c          |    0
 src/{private => core}/na-object-menu-class.h    |    0
 src/{private => core}/na-object-menu-fn.h       |    0
 src/{private => core}/na-object-menu-priv.h     |    0
 src/{private => core}/na-object-menu.c          |    0
 src/{private => core}/na-object-priv.h          |    0
 src/{private => core}/na-object-profile-class.h |    0
 src/{private => core}/na-object-profile-fn.h    |    0
 src/{private => core}/na-object-profile-priv.h  |    0
 src/{private => core}/na-object-profile.c       |    0
 src/{private => core}/na-object.c               |    0
 src/{runtime => core}/na-pivot.c                |    0
 src/{runtime => core}/na-pivot.h                |    0
 src/{runtime => core}/na-utils.c                |    0
 src/{runtime => core}/na-utils.h                |    0
 src/{runtime => core}/na-xml-names.h            |    0
 src/{runtime => core}/na-xml-writer.c           |    0
 src/{runtime => core}/na-xml-writer.h           |    0
 52 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f44b68b..c12eedf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-02-15 Pierre Wieser <pwieser trychlos org>
 
+	Merge src/private/ and src/runtime to src/core/
 	Rename src/api/na-api.h to src/api/na-extension.h
 
 	* src/api/README:
diff --git a/configure.ac b/configure.ac
index c69d130..fbc8f50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_INIT([Nautilus-Actions],[2.29.5],[maintainer nautilus-actions org])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 
-AC_CONFIG_SRCDIR([src/plugin/nautilus-module.c])
+AC_CONFIG_SRCDIR([src/plugin-menu/nautilus-module.c])
 
 AC_CONFIG_HEADERS([src/config.h])
 
@@ -49,13 +49,13 @@ AC_CONFIG_FILES([
 	icons/scalable/Makefile
 	src/Makefile
 	src/api/Makefile
+	src/core/Makefile
 	src/io-desktop/Makefile
 	src/io-gconf/Makefile
-	src/nact/Makefile
+	src/io-xml/Makefile
 	src/plugin-menu/Makefile
 	src/plugin-tracker/Makefile
-	src/private/Makefile
-	src/runtime/Makefile
+	src/nact/Makefile
 	src/test/Makefile
 	src/utils/Makefile
 	po/Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 16b48ad..0ec9eaf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,8 +28,7 @@
 
 SUBDIRS = \
 	api									\
-	private								\
-	runtime								\
+	core								\
 	io-desktop							\
 	io-gconf							\
 	io-xml								\
diff --git a/src/runtime/Makefile.am b/src/core/Makefile.am
similarity index 100%
rename from src/runtime/Makefile.am
rename to src/core/Makefile.am
diff --git a/src/runtime/README b/src/core/README
similarity index 100%
rename from src/runtime/README
rename to src/core/README
diff --git a/src/runtime/na-gconf-utils.c b/src/core/na-gconf-utils.c
similarity index 100%
rename from src/runtime/na-gconf-utils.c
rename to src/core/na-gconf-utils.c
diff --git a/src/runtime/na-gconf-utils.h b/src/core/na-gconf-utils.h
similarity index 100%
rename from src/runtime/na-gconf-utils.h
rename to src/core/na-gconf-utils.h
diff --git a/src/private/na-gnome-vfs-uri.c b/src/core/na-gnome-vfs-uri.c
similarity index 100%
rename from src/private/na-gnome-vfs-uri.c
rename to src/core/na-gnome-vfs-uri.c
diff --git a/src/private/na-gnome-vfs-uri.h b/src/core/na-gnome-vfs-uri.h
similarity index 100%
rename from src/private/na-gnome-vfs-uri.h
rename to src/core/na-gnome-vfs-uri.h
diff --git a/src/runtime/na-iabout.c b/src/core/na-iabout.c
similarity index 100%
rename from src/runtime/na-iabout.c
rename to src/core/na-iabout.c
diff --git a/src/runtime/na-iabout.h b/src/core/na-iabout.h
similarity index 100%
rename from src/runtime/na-iabout.h
rename to src/core/na-iabout.h
diff --git a/src/private/na-iduplicable.c b/src/core/na-iduplicable.c
similarity index 100%
rename from src/private/na-iduplicable.c
rename to src/core/na-iduplicable.c
diff --git a/src/private/na-iduplicable.h b/src/core/na-iduplicable.h
similarity index 100%
rename from src/private/na-iduplicable.h
rename to src/core/na-iduplicable.h
diff --git a/src/runtime/na-io-provider.c b/src/core/na-io-provider.c
similarity index 100%
rename from src/runtime/na-io-provider.c
rename to src/core/na-io-provider.c
diff --git a/src/runtime/na-io-provider.h b/src/core/na-io-provider.h
similarity index 100%
rename from src/runtime/na-io-provider.h
rename to src/core/na-io-provider.h
diff --git a/src/runtime/na-ipivot-consumer.c b/src/core/na-ipivot-consumer.c
similarity index 100%
rename from src/runtime/na-ipivot-consumer.c
rename to src/core/na-ipivot-consumer.c
diff --git a/src/runtime/na-ipivot-consumer.h b/src/core/na-ipivot-consumer.h
similarity index 100%
rename from src/runtime/na-ipivot-consumer.h
rename to src/core/na-ipivot-consumer.h
diff --git a/src/runtime/na-iprefs.c b/src/core/na-iprefs.c
similarity index 100%
rename from src/runtime/na-iprefs.c
rename to src/core/na-iprefs.c
diff --git a/src/runtime/na-iprefs.h b/src/core/na-iprefs.h
similarity index 100%
rename from src/runtime/na-iprefs.h
rename to src/core/na-iprefs.h
diff --git a/src/runtime/na-module.c b/src/core/na-module.c
similarity index 100%
rename from src/runtime/na-module.c
rename to src/core/na-module.c
diff --git a/src/runtime/na-module.h b/src/core/na-module.h
similarity index 100%
rename from src/runtime/na-module.h
rename to src/core/na-module.h
diff --git a/src/private/na-object-action-class.h b/src/core/na-object-action-class.h
similarity index 100%
rename from src/private/na-object-action-class.h
rename to src/core/na-object-action-class.h
diff --git a/src/private/na-object-action-fn.h b/src/core/na-object-action-fn.h
similarity index 100%
rename from src/private/na-object-action-fn.h
rename to src/core/na-object-action-fn.h
diff --git a/src/private/na-object-action-priv.h b/src/core/na-object-action-priv.h
similarity index 100%
rename from src/private/na-object-action-priv.h
rename to src/core/na-object-action-priv.h
diff --git a/src/private/na-object-action.c b/src/core/na-object-action.c
similarity index 100%
rename from src/private/na-object-action.c
rename to src/core/na-object-action.c
diff --git a/src/private/na-object-class.h b/src/core/na-object-class.h
similarity index 100%
rename from src/private/na-object-class.h
rename to src/core/na-object-class.h
diff --git a/src/private/na-object-fn.h b/src/core/na-object-fn.h
similarity index 100%
rename from src/private/na-object-fn.h
rename to src/core/na-object-fn.h
diff --git a/src/private/na-object-id-class.h b/src/core/na-object-id-class.h
similarity index 100%
rename from src/private/na-object-id-class.h
rename to src/core/na-object-id-class.h
diff --git a/src/private/na-object-id-fn.h b/src/core/na-object-id-fn.h
similarity index 100%
rename from src/private/na-object-id-fn.h
rename to src/core/na-object-id-fn.h
diff --git a/src/private/na-object-id-priv.h b/src/core/na-object-id-priv.h
similarity index 100%
rename from src/private/na-object-id-priv.h
rename to src/core/na-object-id-priv.h
diff --git a/src/private/na-object-id.c b/src/core/na-object-id.c
similarity index 100%
rename from src/private/na-object-id.c
rename to src/core/na-object-id.c
diff --git a/src/private/na-object-item-class.h b/src/core/na-object-item-class.h
similarity index 100%
rename from src/private/na-object-item-class.h
rename to src/core/na-object-item-class.h
diff --git a/src/private/na-object-item-fn.h b/src/core/na-object-item-fn.h
similarity index 100%
rename from src/private/na-object-item-fn.h
rename to src/core/na-object-item-fn.h
diff --git a/src/private/na-object-item-priv.h b/src/core/na-object-item-priv.h
similarity index 100%
rename from src/private/na-object-item-priv.h
rename to src/core/na-object-item-priv.h
diff --git a/src/private/na-object-item.c b/src/core/na-object-item.c
similarity index 100%
rename from src/private/na-object-item.c
rename to src/core/na-object-item.c
diff --git a/src/private/na-object-menu-class.h b/src/core/na-object-menu-class.h
similarity index 100%
rename from src/private/na-object-menu-class.h
rename to src/core/na-object-menu-class.h
diff --git a/src/private/na-object-menu-fn.h b/src/core/na-object-menu-fn.h
similarity index 100%
rename from src/private/na-object-menu-fn.h
rename to src/core/na-object-menu-fn.h
diff --git a/src/private/na-object-menu-priv.h b/src/core/na-object-menu-priv.h
similarity index 100%
rename from src/private/na-object-menu-priv.h
rename to src/core/na-object-menu-priv.h
diff --git a/src/private/na-object-menu.c b/src/core/na-object-menu.c
similarity index 100%
rename from src/private/na-object-menu.c
rename to src/core/na-object-menu.c
diff --git a/src/private/na-object-priv.h b/src/core/na-object-priv.h
similarity index 100%
rename from src/private/na-object-priv.h
rename to src/core/na-object-priv.h
diff --git a/src/private/na-object-profile-class.h b/src/core/na-object-profile-class.h
similarity index 100%
rename from src/private/na-object-profile-class.h
rename to src/core/na-object-profile-class.h
diff --git a/src/private/na-object-profile-fn.h b/src/core/na-object-profile-fn.h
similarity index 100%
rename from src/private/na-object-profile-fn.h
rename to src/core/na-object-profile-fn.h
diff --git a/src/private/na-object-profile-priv.h b/src/core/na-object-profile-priv.h
similarity index 100%
rename from src/private/na-object-profile-priv.h
rename to src/core/na-object-profile-priv.h
diff --git a/src/private/na-object-profile.c b/src/core/na-object-profile.c
similarity index 100%
rename from src/private/na-object-profile.c
rename to src/core/na-object-profile.c
diff --git a/src/private/na-object.c b/src/core/na-object.c
similarity index 100%
rename from src/private/na-object.c
rename to src/core/na-object.c
diff --git a/src/runtime/na-pivot.c b/src/core/na-pivot.c
similarity index 100%
rename from src/runtime/na-pivot.c
rename to src/core/na-pivot.c
diff --git a/src/runtime/na-pivot.h b/src/core/na-pivot.h
similarity index 100%
rename from src/runtime/na-pivot.h
rename to src/core/na-pivot.h
diff --git a/src/runtime/na-utils.c b/src/core/na-utils.c
similarity index 100%
rename from src/runtime/na-utils.c
rename to src/core/na-utils.c
diff --git a/src/runtime/na-utils.h b/src/core/na-utils.h
similarity index 100%
rename from src/runtime/na-utils.h
rename to src/core/na-utils.h
diff --git a/src/runtime/na-xml-names.h b/src/core/na-xml-names.h
similarity index 100%
rename from src/runtime/na-xml-names.h
rename to src/core/na-xml-names.h
diff --git a/src/runtime/na-xml-writer.c b/src/core/na-xml-writer.c
similarity index 100%
rename from src/runtime/na-xml-writer.c
rename to src/core/na-xml-writer.c
diff --git a/src/runtime/na-xml-writer.h b/src/core/na-xml-writer.h
similarity index 100%
rename from src/runtime/na-xml-writer.h
rename to src/core/na-xml-writer.h